Importer chooser page rewritten in JavaFX

Author: dbarashev

ganttproject/src/main/java/net/sourceforge/ganttproject/export/ExportFileChooserPage.kt

@@ -43,10 +43,10 @@ import javax.swing.filechooser.FileFilter
 internal class ExportFileChooserPage(
   private val myState: ExportFileWizardImpl.State,
   private val myProject: IGanttProject,
-  prefs: Preferences,
+  override val preferences: Preferences,
   uiFacade: UIFacade?
 ) : FileChooserPageBase(
-  prefs, myProject.document, uiFacade,
+  myProject.document, uiFacade,
   fileChooserTitle = i18n.formatText("selectFileToExport"),
   fileChooserSelectionMode = JFileChooser.FILES_AND_DIRECTORIES,
   pageTitle = i18n.formatText("selectFileToExport")

ganttproject/src/main/java/net/sourceforge/ganttproject/export/ExporterChooserPageFx.kt

@@ -1,4 +1,21 @@
-
+/*
+ * Copyright (c) 2026 Dmitry Barashev, BarD Software s.r.o.
+ *
+ * This file is part of GanttProject, an open-source project management tool.
+ *
+ * GanttProject is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ * GanttProject is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GanttProject.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package net.sourceforge.ganttproject.export
 
 import biz.ganttproject.app.*
@@ -7,6 +24,9 @@ import net.sourceforge.ganttproject.export.ExportFileWizardImpl.State
 import net.sourceforge.ganttproject.gui.projectwizard.WizardPage
 import java.awt.Component
 
+/**
+ * This is the first page of the export wizard that allows the user to choose an exporter.
+ */
 class ExporterChooserPageFx(exporters: List<Exporter>, private val model: State) : WizardPage {
   override val title: String = i18n.formatText("option.exporter.title")
   override val component: Component? = null

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

@@ -40,7 +40,6 @@ import javax.swing.filechooser.FileFilter
  * Base class for the file chooser pages in the Import and Export wizards.
  */
 abstract class FileChooserPageBase protected constructor(
-  protected val preferences: Preferences,
   private val myDocument: Document?,
   uiFacade: UIFacade?,
   val fileChooserTitle: String?,
@@ -52,6 +51,9 @@ abstract class FileChooserPageBase protected constructor(
       tryChosenFile(file)
     }
   }
+
+  abstract val preferences: Preferences
+
   private val myOptionsBuilder: OptionsPageBuilder = OptionsPageBuilder().also {
     it.i18N = object : OptionsPageBuilder.I18N() {
       protected override fun hasValue(key: String): Boolean {

ganttproject/src/main/java/net/sourceforge/ganttproject/importer/ImportFileWizard.kt

@@ -18,23 +18,22 @@
  */
 package net.sourceforge.ganttproject.importer
 
-import biz.ganttproject.app.RootLocalizer
+import biz.ganttproject.app.*
 import biz.ganttproject.core.option.GPOptionGroup
 import com.github.michaelbull.result.Err
 import com.github.michaelbull.result.Ok
 import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.andThen
 import javafx.beans.property.SimpleObjectProperty
 import javafx.scene.Node
-import javafx.scene.control.Label
 import net.sourceforge.ganttproject.IGanttProject
 import net.sourceforge.ganttproject.filter.ExtensionBasedFileFilter
 import net.sourceforge.ganttproject.gui.FileChooserPageBase
 import net.sourceforge.ganttproject.gui.UIFacade
 import net.sourceforge.ganttproject.gui.projectwizard.WizardModel
 import net.sourceforge.ganttproject.gui.projectwizard.WizardPage
 import net.sourceforge.ganttproject.gui.projectwizard.showWizard
-import net.sourceforge.ganttproject.plugins.PluginManager.*
+import net.sourceforge.ganttproject.plugins.PluginManager.getExtensions
 import org.osgi.service.prefs.Preferences
 import java.awt.Component
 import java.io.File
@@ -52,7 +51,7 @@ class ImportFileWizard(uiFacade: UIFacade, project: IGanttProject, pluginPrefere
     filePage.selectedFileProperty.addListener { _, _, _ ->
       wizardModel.needsRefresh.set(true, this)
     }
-    wizardModel.addPage(ImporterChooserPage(importers, uiFacade, pluginPreferences, wizardModel))
+    wizardModel.addPage(ImporterChooserPageFx(importers, wizardModel))
     wizardModel.addPage(filePage)
     wizardModel.customPageProperty.addListener { _, oldValue, newValue ->
       if (oldValue == null && newValue != null) {
@@ -68,6 +67,9 @@ class ImportFileWizard(uiFacade: UIFacade, project: IGanttProject, pluginPrefere
   }
 }
 
+// --------------------------------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
+
 /**
  * Model for the import wizard, managing importer and file selection.
  */
@@ -78,6 +80,7 @@ class ImporterWizardModel: WizardModel() {
       field = value
       customPageProperty.set(null)
       value?.customPage?.let { customPageProperty.set(it) }
+      needsRefresh.set(true, this)
     }
 
   // Selected file.
@@ -105,36 +108,57 @@ private fun getImporters(): MutableList<Importer> {
   return getExtensions(Importer.EXTENSION_POINT_ID, Importer::class.java)
 }
 
-private class ImporterChooserPageFx(
-  importers: List<Importer>,
-  uiFacade: UIFacade,
-  pluginPreferences: Preferences,
-  wizardModel: ImporterWizardModel
-) : WizardPage {
-  override val title: String = i18n.formatText("importerChooserPageTitle")
-  override val component: Component?
-    get() = null
+// --------------------------------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 
-  override fun setActive(b: Boolean) {
+/**
+ * The first page in the import wizard that allows the user to choose an importer.
+ */
+private class ImporterChooserPageFx(importers: List<Importer>, model: ImporterWizardModel) : WizardPage {
+  override val title: String = RootLocalizer.formatText("importerChooserPageTitle")
+
+  private val titles = importers.flatMapIndexed { index, importer -> listOf(
+    "title.$index" to { LocalizedString(importer.fileTypeDescription, DummyLocalizer)},
+    "title.$index.help" to { LocalizedString("", DummyLocalizer)}
+  )}.toMap()
+
+  override val fxComponent: Node? by lazy {
+    val optionPaneBuilder = OptionPaneBuilder<Importer>().apply {
+      this.i18n = MappingLocalizer(titles, DummyLocalizer::create)
+      this.styleClass = "exporter-chooser-page"
+      elements = importers.mapIndexed { index, importer ->
+        OptionElementData("title.${index}", importer, isSelected = (index == 0),
+          customContent = null)
+      }
+      onSelect = { model.importer = it }
+    }
+    optionPaneBuilder.buildPane()
   }
 
-  override val fxComponent: Node by lazy {
-    Label("foo")
+  override val component: Component? = null
+
+  override fun setActive(b: Boolean) {
   }
 }
+
+// --------------------------------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
+
 /**
  * Wizard page for choosing a file to import from.
  */
 private class ImportFileChooserPage(
-  private val state: ImporterWizardModel, project: IGanttProject, prefs: Preferences, uiFacade: UIFacade)
-  : FileChooserPageBase(prefs, project.document, uiFacade, fileChooserTitle = "",
+  private val state: ImporterWizardModel, project: IGanttProject, private val prefs: Preferences, uiFacade: UIFacade)
+  : FileChooserPageBase(project.document, uiFacade, fileChooserTitle = "",
   pageTitle = i18n.formatText("importerFileChooserPageTitle")) {
 
   val importer get() = state.importer
 
+  override val preferences: Preferences get() = prefs.node(state.importer?.id ?: "")
+
   init {
     hasOverwriteOption = false
-    selectedFileProperty.addListener { value, file, newValue ->
+    selectedFileProperty.addListener { _, _, newValue ->
       state.file = newValue
     }
   }
@@ -144,7 +168,6 @@ private class ImportFileChooserPage(
       return ExtensionBasedFileFilter(it.getFileNamePattern(), it.getFileTypeDescription())
     }
 
-
   override val optionGroups: List<GPOptionGroup> = emptyList()
 
   override fun validateFile(file: File?): Result<File?, String?> {