addad checkDatabaseDir

1 files changed, 14 insertions, 4 deletions

diff --git a/sources/shared/Main.java b/sources/shared/Main.java
index a22bf24..54e11a9 100644
--- a/sources/shared/Main.java
+++ b/sources/shared/Main.java
@@ -1,11 +1,8 @@
 package shared;
 
 import java.io.*;
-
 import javax.swing.JFrame;
-
 import server.*;
-
 import client.*;
 
 /**
@@ -40,7 +37,7 @@ public final class Main {
     if (Config.getBooleanValue("server_run")) {
       new NetCalendarServer(
         Config.getIntValue("server_port"),
-        Config.getStringValue("server_database_dir"));
+        checkDatabaseDir(Config.getStringValue("server_database_dir")));
     }
 
     if (Config.getBooleanValue("client_run")) {
@@ -52,6 +49,19 @@ public final class Main {
   }
 
   /**
+   * For checking if the database dir exists. If not, use one upper level
+   * directory.
+   * @param sDatabaseDir The database dir
+   * @return The database dir if exists, else one upper level directory
+   */
+  private static String checkDatabaseDir(String sDatabaseDir) {
+    if (new File(sDatabaseDir).exists())
+      return sDatabaseDir;
+
+    return "../" + sDatabaseDir;
+  }
+
+  /**
    * All info messages of the calendar client and the calendar server go through this method.
    * They are not using System.out.* directly.
    * @param sMessage Specifies the program info message.