Process error when running auto-open last document

Author: dbarashev

ganttproject/src/main/java/biz/ganttproject/storage/Document.kt

@@ -41,6 +41,7 @@ import net.sourceforge.ganttproject.document.FileDocument
 import net.sourceforge.ganttproject.document.ProxyDocument
 import net.sourceforge.ganttproject.document.webdav.WebDavStorageImpl
 import net.sourceforge.ganttproject.gui.ProjectUIFacade
+import net.sourceforge.ganttproject.gui.UIFacade
 import net.sourceforge.ganttproject.storage.BaseTxnId
 import org.xml.sax.SAXException
 import java.io.File
@@ -341,13 +342,21 @@ fun String.asDocumentUrl(): Pair<URL, String> =
   }
 
 // Tries to open the most recent document, if the corresponding option is switched on.
-fun maybeOpenLastDocument(project: IGanttProject, projectUIFacade: ProjectUIFacade) {
+fun maybeOpenLastDocument(project: IGanttProject, uiFacade: UIFacade, projectUIFacade: ProjectUIFacade) {
   if (!reopenLastFileOption.isChecked) {
     return
   }
   val recentDocsConsumer = Consumer<List<RecentDocAsFolderItem>> { docList ->
     docList.firstOrNull()?.asDocument()?.let {
-      projectUIFacade.openProject(project.documentManager.getProxyDocument(it), project, null, null)
+      val stateMachine = projectUIFacade.openProject(project.documentManager.getProxyDocument(it), project, null, null)
+      stateMachine.stateFailed.await {
+        LOG.error("{}: {}", it.errorTitle, it.errorDescription, exception = it.throwable)
+        uiFacade.showErrorDialog("""
+          # ${it.errorTitle}
+          ----
+          ${it.errorDescription}
+        """.trimIndent())
+      }
     }
   }
   val busyIndicator = Consumer<Boolean> {  }
@@ -405,4 +414,4 @@ fun DocumentManager.loadRecentDocs(
   }
 }
 
-private val LOG = GPLogger.create("Document")
+private val LOG = GPLogger.create("Document")

ganttproject/src/main/java/net/sourceforge/ganttproject/gui/ProjectOpenStrategy.kt

@@ -483,7 +483,7 @@ internal class CommandLineProjectOpenStrategy(
     if (path != null) {
       doOpenStartupDocument(path)
     } else {
-      maybeOpenLastDocument(project, projectUiFacade)
+      maybeOpenLastDocument(project, uiFacade, projectUiFacade)
     }
   }
   private fun doOpenStartupDocument(path: String) {
@@ -536,4 +536,4 @@ internal class CommandLineProjectOpenStrategy(
 }
 
 private val DOCUMENT_LOGGER = GPLogger.create("Document.Info")
-private val DOCUMENT_ERROR_LOGGER = GPLogger.create("Document.Error")
+private val DOCUMENT_ERROR_LOGGER = GPLogger.create("Document.Error")

ganttproject/src/main/java/net/sourceforge/ganttproject/storage/SqlDatabaseUtils.kt

@@ -28,7 +28,18 @@ fun runStatements(dataSource: DataSource, statements: List<String>) {
     ${statements.joinToString(separator = ";\n")};
   """.trimIndent()
   println("Running \n $sqlScript")
-  runScript(dataSource, sqlScript)
+  dataSource.connection.use { cnx ->
+    statements.forEach { query ->
+      cnx.createStatement().use { stmt ->
+        try {
+          stmt.execute(query)
+        } catch (e: Exception) {
+          throw ProjectDatabaseException("Failed to execute statement: $query", e)
+        }
+      }
+    }
+    cnx.commit()
+  }
 }
 
 fun runScriptFromResource(dataSource: DataSource, path: String) {