From dd5481f216a739df64c4992a73cad5c88d456c09 Mon Sep 17 00:00:00 2001
From: dev <dev@robertfoss.se>
Date: Tue, 5 Jul 2011 14:10:19 +0000
Subject: [PATCH] Enabled saving of config files.

---
 src/net/i2p/itoopie/Main.java                        | 12 +++++++++---
 src/net/i2p/itoopie/TrayManager.java                 |  2 +-
 .../itoopie/configuration/ConfigurationManager.java  |  6 ++++--
 src/net/i2p/itoopie/i2pcontrol/JSONInterface.java    |  6 +++---
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/net/i2p/itoopie/Main.java b/src/net/i2p/itoopie/Main.java
index 439642d5b..f334c0e0d 100644
--- a/src/net/i2p/itoopie/Main.java
+++ b/src/net/i2p/itoopie/Main.java
@@ -78,9 +78,9 @@ public class Main {
             //log.log(Log.ERROR, null, ex);
         }
         
-        _conf.parseConfigStr("server-name=127.0.0.1");
-        _conf.parseConfigStr("server-port=5555");
-        _conf.parseConfigStr("server-target=jsonrpc");
+        _conf.parseConfigStr("server.hostname=127.0.0.1");
+        _conf.parseConfigStr("server.port=5555");
+        _conf.parseConfigStr("server.target=jsonrpc");
         
         
         
@@ -120,6 +120,12 @@ public class Main {
         });
     }
     
+    @SuppressWarnings("static-access")
+	public static void beginShutdown(){
+    	_conf.writeConfFile();
+    	System.exit(0);
+    }
+    
     /**
      * Avoids the app terminating because no Window is opened anymore.
      * More info: http://java.sun.com/javase/6/docs/api/java/awt/doc-files/AWTThreadIssues.html#Autoshutdown
diff --git a/src/net/i2p/itoopie/TrayManager.java b/src/net/i2p/itoopie/TrayManager.java
index ad74a94ef..c5115865d 100644
--- a/src/net/i2p/itoopie/TrayManager.java
+++ b/src/net/i2p/itoopie/TrayManager.java
@@ -129,7 +129,7 @@ public class TrayManager {
                     
                     @Override
                     protected Object doInBackground() throws Exception {
-                        System.exit(0);
+                        Main.beginShutdown();
                         return null;
                     }
                 }.execute();
diff --git a/src/net/i2p/itoopie/configuration/ConfigurationManager.java b/src/net/i2p/itoopie/configuration/ConfigurationManager.java
index c14e7f69e..36ff34522 100644
--- a/src/net/i2p/itoopie/configuration/ConfigurationManager.java
+++ b/src/net/i2p/itoopie/configuration/ConfigurationManager.java
@@ -34,7 +34,9 @@ public class ConfigurationManager {
 	//Configurations with an Integer as value
 	private static Map<String, Integer> integerConfigurations = new HashMap<String, Integer>();
 
-	private ConfigurationManager() {}
+	private ConfigurationManager() {
+		readConfFile();
+	}
 	
 	public synchronized static ConfigurationManager getInstance() {
 		if(instance == null) {
@@ -69,7 +71,7 @@ public class ConfigurationManager {
 			}
 			br.close();
 		} catch (FileNotFoundException e) {
-			_log.error("Unable to find config file, " + DEFAULT_CONFIG_LOCATION);
+			_log.info("Unable to find config file, " + DEFAULT_CONFIG_LOCATION);
 		} catch (IOException e) {
 			_log.error("Unable to read from config file, " + DEFAULT_CONFIG_LOCATION);
 		}
diff --git a/src/net/i2p/itoopie/i2pcontrol/JSONInterface.java b/src/net/i2p/itoopie/i2pcontrol/JSONInterface.java
index a546e999d..7c0c71c93 100644
--- a/src/net/i2p/itoopie/i2pcontrol/JSONInterface.java
+++ b/src/net/i2p/itoopie/i2pcontrol/JSONInterface.java
@@ -40,9 +40,9 @@ public class JSONInterface {
 
 	public static void setupSession() {
 		URL srvURL = null;
-		String srvHost = _conf.getConf("server-hostname", "localhost");
-		int srvPort = _conf.getConf("server-port", 7656);
-		String srvTarget = _conf.getConf("server-target", "jsonrpc");
+		String srvHost = _conf.getConf("server.hostname", "localhost");
+		int srvPort = _conf.getConf("server.port", 7656);
+		String srvTarget = _conf.getConf("server.target", "jsonrpc");
 		try {
 			srvURL = new URL("https://" + srvHost + ":" + srvPort + "/"
 					+ srvTarget);