Change generation of files/paths in db dir to use FileManager

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index 328d5cb..ea84213 100644 (file)
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -873,7 +873,7 @@ public class Global {
                String val  = (String)settings.value("DatabaseURL", "");\r
                settings.endGroup();\r
                if (val.equals(""))\r
-                       val = "jdbc:h2:"+Global.getDirectoryPath() +File.separator +"db" +File.separator +Global.databaseName;\r
+                       val = "jdbc:h2:"+Global.getFileManager().getDbDirPath(Global.databaseName);\r
                return val;\r
     }\r
     public static String getDatabaseUserid() {\r

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 792870c..3153cd9 100644 (file)
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -832,7 +832,8 @@ public class NeverNote extends QMainWindow{
        }
        private boolean lockApplication() {
                                
-               String fileName = Global.currentDir +"db" +File.separator +"NeverNote.lock.db";
+               // NFC TODO: who creates this - H2? should it be parameterized with databaseName like in RDatabaseConnection? 
+               String fileName = Global.getFileManager().getDbDirPath("NeverNote.lock.db");
 //             QFile.remove(fileName);
                if (QFile.exists(fileName)) {
                        QMessageBox.question(this, "Lock File Detected",

diff --git a/src/cx/fbn/nevernote/sql/DatabaseConnection.java b/src/cx/fbn/nevernote/sql/DatabaseConnection.java
index 8700171..d26126a 100644 (file)
--- a/src/cx/fbn/nevernote/sql/DatabaseConnection.java
+++ b/src/cx/fbn/nevernote/sql/DatabaseConnection.java
@@ -60,7 +60,8 @@ public class DatabaseConnection {
        public void dbSetup() {
                logger.log(logger.HIGH, "Entering DatabaseConnection.dbSetup " +id);
 
-               File f = new File(Global.getDirectoryPath() +File.separator +"db" +File.separator +"NeverNote.h2.db");
+               // NFC FIXME: should be parameterized with databaseName like in RDatabaseConnection?
+               File f = Global.getFileManager().getDbDirFile("NeverNote.h2.db");
                boolean dbExists = f.exists(); 
                
                // If it doesn't exist and we are the main thread, then we need to create stuff.

diff --git a/src/cx/fbn/nevernote/sql/runners/RDatabaseConnection.java b/src/cx/fbn/nevernote/sql/runners/RDatabaseConnection.java
index 6965655..155a151 100644 (file)
--- a/src/cx/fbn/nevernote/sql/runners/RDatabaseConnection.java
+++ b/src/cx/fbn/nevernote/sql/runners/RDatabaseConnection.java
@@ -98,7 +98,7 @@ public class RDatabaseConnection {
                
                setupTables();
                
-               File f = new File(Global.getDirectoryPath() +File.separator +"db" +File.separator +databaseName +".h2.db");
+               File f = Global.getFileManager().getDbDirFile(databaseName + ".h2.db");
                boolean dbExists = f.exists(); 
 
                try {