One more review round

Author: dbarashev

ganttproject/src/main/java/biz/ganttproject/app/Dialog.kt

@@ -317,7 +317,7 @@ class DialogControllerSwing : DialogController {
 
   override fun toggleProgress(shown: Boolean): () -> Unit {
     val countDown = CountDownLatch(2)
-    GlobalScope.launch(Dispatchers.JavaFx) {
+    FXThread.runLater {
       val transition = createOverlayPane(this@DialogControllerSwing.content, this@DialogControllerSwing.contentStack) {pane ->
         pane.center = Spinner().let {
           it.state = Spinner.State.WAITING
@@ -400,31 +400,8 @@ class DialogControllerSwing : DialogController {
   }
 
   override fun removeButtonBar() {
-//    this.buttons.clear()
-//    this.buttonNodes.clear()
     this.buttonBarDisabled = true
-    //this.buttonBar = null
-  }
-
-//  private fun updateButtons(buttonBar: ButtonBar) {
-//    buttonBar.buttons.clear()
-//    // show details button if expandable content is present
-//    var hasDefault = false
-//    for (cmd in buttons) {
-//      val button = buttonNodes.computeIfAbsent(cmd, ::createButton)
-//      // keep only first default button
-//      val buttonType = cmd.buttonData
-//      button.isDefaultButton = !hasDefault && buttonType != null && buttonType.isDefaultButton
-//      button.isCancelButton = buttonType != null && buttonType.isCancelButton
-//      hasDefault = hasDefault || buttonType != null && buttonType.isDefaultButton
-//      buttonBar.buttons.add(button)
-//
-//      button.addEventHandler(ActionEvent.ACTION) { ae: ActionEvent ->
-//        if (ae.isConsumed) return@addEventHandler
-//        hide()
-//      }
-//    }
-//  }
+  }
 
   private fun createButton(buttonType: ButtonType): Button {
     val button = Button(buttonType.text)
@@ -521,15 +498,9 @@ class DialogControllerFx(private val dialogPane: DialogPaneExt, private val dial
         bb.height = 5.0
         bb.iterations = 2
       }
-//      createOverlayPane(this.content, this.stackPane) {pane ->
-//        pane.styleClass.add("overlay")
-//        pane.center = Label("")
-//        pane.opacity = 0.5
-//      }
     }
     return {
       Platform.runLater {
-//        this.stackPane.children.removeIf { it.styleClass.contains("overlay") }
         this.content.effect = null
       }
     }

ganttproject/src/main/java/biz/ganttproject/storage/cloud/GPCloudStatusBar.kt

@@ -277,6 +277,7 @@ class GPCloudStatusBar(
           text = STATUS_BAR_LOCALIZER.formatText("mode.onlineOnly")
           graphic = FontAwesomeIconView(FontAwesomeIcon.CLOUD)
           tooltip = Tooltip(STATUS_BAR_LOCALIZER.formatText("mode.onlineOnly.tooltip"))
+          // TODO(dbarashev): restore offline-only mode indication
           //Decorator.removeAllDecorations(this)
           isDisable = false
         }

ganttproject/src/main/java/net/sourceforge/ganttproject/ProjectOpenStateMachine.kt

@@ -248,9 +248,11 @@ class ProjectOpenStateMachine(val project: IGanttProject, val scope: CoroutineSc
 typealias ProjectOpenStateMachineBuilder = (ProjectOpenStateMachine) -> Unit
 
 /**
- * This class creates project open activities. A new activity is created when GanttProject opens a project
- * document. Listeners receive an instance of the state machine and can subscribe to the state changes
+ * This object creates project open activities. A new activity is created when GanttProject opens a project
+ * document. Builders receive an instance of the state machine and can subscribe to the state changes
  * and run the appropriate code when a state machine enters into the state they are waiting for.
+ *
+ * This is a singleton, so builders shall be registered wisely, just one per application run.
  */
 object ProjectOpenActivityFactory {
   private val builders = mutableListOf<ProjectOpenStateMachineBuilder>()

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

@@ -30,10 +30,10 @@ import com.github.michaelbull.result.Ok
 import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.fold
 import com.google.common.collect.Lists
-import javafx.beans.value.ChangeListener
-import javafx.beans.value.ObservableValue
-import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Runnable
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import net.sourceforge.ganttproject.*
 import net.sourceforge.ganttproject.action.GPAction
 import net.sourceforge.ganttproject.action.OkAction
@@ -55,7 +55,6 @@ import org.xml.sax.SAXException
 import java.awt.BorderLayout
 import java.awt.event.ActionEvent
 import java.io.File
-import java.util.concurrent.Executors
 import java.util.function.Consumer
 import java.util.regex.Pattern
 import javax.swing.*
@@ -355,25 +354,7 @@ internal class ProjectOpenStrategy(
     }
   }
 
-  internal inner class Step4 {
-    fun onFetchResultChange(document: Document, callback: () -> Unit) {
-      val onlineDocument = document.asOnlineDocument()
-      if (onlineDocument != null) {
-        val changeListener = object : ChangeListener<FetchResult?> {
-          override fun changed(observable: ObservableValue<out FetchResult?>?, oldFetch: FetchResult?, newFetch: FetchResult?) {
-            println("oldFetch=${oldFetch?.actualChecksum} newFetch=${newFetch?.actualChecksum}")
-            if (oldFetch != null && newFetch != null) {
-              if (oldFetch.actualVersion != newFetch.actualVersion) {
-                observable?.removeListener(this)
-                callback()
-              }
-            }
-          }
-        }
-        onlineDocument.fetchResultProperty.addListener(changeListener)
-      }
-
-    }
+  internal class Step4 {
   }
   companion object {
     val milestonesOption = DefaultEnumerationOption(
@@ -403,22 +384,6 @@ internal class CommandLineProjectOpenStrategy(
   private fun doOpenStartupDocument(path: String) {
     DOCUMENT_LOGGER.debug(">>> openStartupDocument($path)")
     val document: Document = documentManager.getDocument(path)
-//    val finishChannel = Channel<Boolean>()
-//    CoroutineScope(Executors.newSingleThreadExecutor().asCoroutineDispatcher()).launch {
-//      try {
-//        finishChannel.receive()
-//      } catch (e: Document.DocumentException) {
-//        if (!tryImportDocument(document)) {
-//          uiFacade.showErrorDialog(e)
-//        }
-//      } catch (e: IOException) {
-//        // TODO: shall we try to import a document here? when it may make sense? CSV/MPP ?
-//          uiFacade.showErrorDialog(e)
-//      } catch (e: Exception) {
-//        uiFacade.showErrorDialog(e)
-//      }
-//
-//    }
     projectUiFacade.openProject(document, project, null).apply {
       stateCompleted.await {
         DOCUMENT_LOGGER.debug("<<< openStartupDocument($path)")