diff -r ed84c8bdd87b -r 1f9e5757caf4 src/org/sonews/config/FileConfig.java
--- a/src/org/sonews/config/FileConfig.java	Sun Aug 29 17:28:58 2010 +0200
+++ b/src/org/sonews/config/FileConfig.java	Fri Oct 14 17:50:35 2011 +0200
@@ -35,136 +35,120 @@
 class FileConfig extends AbstractConfig
 {
 
-  private static final Properties defaultConfig = new Properties();
-  
-  private static FileConfig instance = null;
-  
-  static
-  {
-    // Set some default values
-    defaultConfig.setProperty(Config.STORAGE_DATABASE, "jdbc:mysql://localhost/sonews");
-    defaultConfig.setProperty(Config.STORAGE_DBMSDRIVER, "com.mysql.jdbc.Driver");
-    defaultConfig.setProperty(Config.STORAGE_USER, "sonews_user");
-    defaultConfig.setProperty(Config.STORAGE_PASSWORD, "mysecret");
-    defaultConfig.setProperty(Config.DEBUG, "false");
-  }
-  
-  /**
-   * Note: this method is not thread-safe
-   * @return A Config instance
-   */
-  public static synchronized FileConfig getInstance()
-  {
-    if(instance == null)
-    {
-      instance = new FileConfig();
-    }
-    return instance;
-  }
+	private static final Properties defaultConfig = new Properties();
+	private static FileConfig instance = null;
 
-  // Every config instance is initialized with the default values.
-  private final Properties settings = (Properties)defaultConfig.clone();
+	static {
+		// Set some default values
+		defaultConfig.setProperty(Config.STORAGE_DATABASE, "jdbc:mysql://localhost/sonews");
+		defaultConfig.setProperty(Config.STORAGE_DBMSDRIVER, "com.mysql.jdbc.Driver");
+		defaultConfig.setProperty(Config.STORAGE_USER, "sonews_user");
+		defaultConfig.setProperty(Config.STORAGE_PASSWORD, "mysecret");
+		defaultConfig.setProperty(Config.DEBUG, "false");
+	}
 
-  /**
-   * Config is a singelton class with only one instance at time.
-   * So the constructor is private to prevent the creation of more
-   * then one Config instance.
-   * @see Config.getInstance() to retrieve an instance of Config
-   */
-  private FileConfig()
-  {
-    try
-    {
-      // Load settings from file
-      load();
-    }
-    catch(IOException ex)
-    {
-      ex.printStackTrace();
-    }
-  }
+	/**
+	 * Note: this method is not thread-safe
+	 * @return A Config instance
+	 */
+	public static synchronized FileConfig getInstance()
+	{
+		if (instance == null) {
+			instance = new FileConfig();
+		}
+		return instance;
+	}
+	// Every config instance is initialized with the default values.
+	private final Properties settings = (Properties) defaultConfig.clone();
 
-  /**
-   * Loads the configuration from the config file. By default this is done
-   * by the (private) constructor but it can be useful to reload the config
-   * by invoking this method.
-   * @throws IOException
-   */
-  public void load() 
-    throws IOException
-  {
-    FileInputStream in = null;
-    
-    try
-    {
-      in = new FileInputStream(
-        Config.inst().get(Config.LEVEL_CLI, Config.CONFIGFILE, "sonews.conf"));
-      settings.load(in);
-    }
-    catch (FileNotFoundException e)
-    {
-      // MUST NOT use Log otherwise endless loop
-      System.err.println(e.getMessage());
-      save();
-    }
-    finally
-    {
-      if(in != null)
-        in.close();
-    }
-  }
+	/**
+	 * Config is a singelton class with only one instance at time.
+	 * So the constructor is private to prevent the creation of more
+	 * then one Config instance.
+	 * @see Config.getInstance() to retrieve an instance of Config
+	 */
+	private FileConfig()
+	{
+		try {
+			// Load settings from file
+			load();
+		} catch (IOException ex) {
+			ex.printStackTrace();
+		}
+	}
 
-  /**
-   * Saves this Config to the config file. By default this is done
-   * at program end.
-   * @throws FileNotFoundException
-   * @throws IOException
-   */
-  public void save() throws FileNotFoundException, IOException
-  {
-    FileOutputStream out = null;
-    try
-    {
-      out = new FileOutputStream(
-        Config.inst().get(Config.LEVEL_CLI, Config.CONFIGFILE, "sonews.conf"));
-      settings.store(out, "SONEWS Config File");
-      out.flush();
-    }
-    catch(IOException ex)
-    {
-      throw ex;
-    }
-    finally
-    {
-      if(out != null)
-        out.close();
-    }
-  }
-  
-  /**
-   * Returns the value that is stored within this config
-   * identified by the given key. If the key cannot be found
-   * the default value is returned.
-   * @param key Key to identify the value.
-   * @param def The default value that is returned if the key
-   * is not found in this Config.
-   * @return
-   */
-  @Override
-  public String get(String key, String def)
-  {
-    return settings.getProperty(key, def);
-  }
+	/**
+	 * Loads the configuration from the config file. By default this is done
+	 * by the (private) constructor but it can be useful to reload the config
+	 * by invoking this method.
+	 * @throws IOException
+	 */
+	public void load()
+		throws IOException
+	{
+		FileInputStream in = null;
 
-  /**
-   * Sets the value for a given key.
-   * @param key
-   * @param value
-   */
-  @Override
-  public void set(final String key, final String value)
-  {
-    settings.setProperty(key, value);
-  }
+		try {
+			in = new FileInputStream(
+				Config.inst().get(Config.LEVEL_CLI, Config.CONFIGFILE, "sonews.conf"));
+			settings.load(in);
+		} catch (FileNotFoundException e) {
+			// MUST NOT use Log otherwise endless loop
+			System.err.println(e.getMessage());
+			save();
+		} finally {
+			if (in != null) {
+				in.close();
+			}
+		}
+	}
 
+	/**
+	 * Saves this Config to the config file. By default this is done
+	 * at program end.
+	 * @throws FileNotFoundException
+	 * @throws IOException
+	 */
+	public void save() throws FileNotFoundException, IOException
+	{
+		FileOutputStream out = null;
+		try {
+			out = new FileOutputStream(
+				Config.inst().get(Config.LEVEL_CLI, Config.CONFIGFILE, "sonews.conf"));
+			settings.store(out, "SONEWS Config File");
+			out.flush();
+		} catch (IOException ex) {
+			throw ex;
+		} finally {
+			if (out != null) {
+				out.close();
+			}
+		}
+	}
+
+	/**
+	 * Returns the value that is stored within this config
+	 * identified by the given key. If the key cannot be found
+	 * the default value is returned.
+	 * @param key Key to identify the value.
+	 * @param def The default value that is returned if the key
+	 * is not found in this Config.
+	 * @return
+	 */
+	@Override
+	public String get(String key, String def)
+	{
+		return settings.getProperty(key, def);
+	}
+
+	/**
+	 * Sets the value for a given key.
+	 * @param key
+	 * @param value
+	 */
+	@Override
+	public void set(final String key, final String value)
+	{
+		settings.setProperty(key, value);
+	}
 }