Replaced file format options in MSProject, CSV, Image exporters with a single class.

Completed the exporter chooser page

Author: dbarashev

biz.ganttproject.core/src/main/java/biz/ganttproject/core/option/DefaultEnumerationOption.java

@@ -32,6 +32,12 @@ public DefaultEnumerationOption(String id, T[] values) {
     reloadValues(Arrays.asList(values));
   }
 
+  public DefaultEnumerationOption(String id, List<T> values) {
+    super(id);
+    myValues = new ArrayList<>();
+    reloadValues(values);
+  }
+
   protected void reloadValues(List<T> values) {
     List<String> oldValues = new ArrayList<>(myValues);
     myValues.clear();

biz.ganttproject.core/src/main/java/biz/ganttproject/core/option/ObservableProperty.kt

@@ -101,8 +101,10 @@ class ObservableString(
 class ObservableBoolean(id: String, initValue: Boolean = false)
   : ObservableProperty<Boolean>(id,initValue)
 
-class ObservableEnum<E : Enum<E>>(id: String, initValue: E, val allValues: Array<E>)
-  : ObservableProperty<E>(id,initValue)
+class ObservableEnum<E : Enum<E>>(id: String, initValue: E, val allValues: List<E>)
+  : ObservableProperty<E>(id,initValue) {
+  constructor(id: String, initValue: E, allValues: Array<E>) : this(id, initValue, allValues.toList())
+}
 
 class ObservableChoice<T>(id: String, initValue: T, val allValues: List<T>, val converter: StringConverter<T>)
   : ObservableProperty<T>(id, initValue)

biz.ganttproject.impex.msproject2/src/main/java/biz/ganttproject/impex/msproject2/ExportWizard.kt

@@ -0,0 +1,23 @@
+/*
+Copyright 2026 Dmitry Barashev, BarD Software s.r.o
+
+This file is part of GanttProject, an opensource 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 biz.ganttproject.impex.msproject2
+
+enum class MsProjectFileFormat(val extension: String) {
+  MPX("mpx"), MSPDI("xml")
+}

biz.ganttproject.impex.msproject2/src/main/java/biz/ganttproject/impex/msproject2/ExporterToMsProjectFile.java

@@ -27,6 +27,7 @@ of the License, or (at your option) any later version.
 import net.sf.mpxj.mpx.MPXWriter;
 import net.sf.mpxj.mspdi.MSPDIWriter;
 import net.sf.mpxj.writer.ProjectWriter;
+import net.sourceforge.ganttproject.export.ExportFileFormatOption;
 import net.sourceforge.ganttproject.export.ExporterBase;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -43,22 +44,8 @@ of the License, or (at your option) any later version.
  */
 public class ExporterToMsProjectFile extends ExporterBase {
 
-  private static final String[] FILE_FORMAT_IDS = new String[] { "impex.msproject.fileformat.mpx",
-      "impex.msproject.fileformat.mspdi" };
-
-  private static final String[] FILE_EXTENSIONS = new String[] { "mpx", "xml" };
-
-  private String myFileFormat = FILE_FORMAT_IDS[0];
-
-  private final EnumerationOption myFileFormatOption = new DefaultEnumerationOption<Object>("impex.msproject.fileformat",
-      FILE_FORMAT_IDS) {
-    @Override
-    public void commit() {
-      super.commit();
-      ExporterToMsProjectFile.this.myFileFormat = getValue();
-    }
-  };
-
+  private final ExportFileFormatOption<MsProjectFileFormat> myFileFormatOption = new ExportFileFormatOption(
+    "impex.msproject.fileformat", MsProjectFileFormat.MPX, Arrays.stream(MsProjectFileFormat.values()).toList());
   private final LocaleOption myLanguageOption = new LocaleOption();
 
   private final GPOptionGroup myOptions = new GPOptionGroup("exporter.msproject", new GPOption[] { myFileFormatOption });
@@ -68,9 +55,6 @@ public void commit() {
   public ExporterToMsProjectFile() {
     myOptions.setTitled(false);
     myMPXOptions.setTitled(false);
-    myFileFormatOption.lock();
-    myFileFormatOption.setValue(FILE_FORMAT_IDS[0]);
-    myFileFormatOption.commit();
     myLanguageOption.setSelectedLocale(language.getLocale());
   }
 
@@ -86,7 +70,7 @@ public GPOptionGroup getOptions() {
 
   @Override
   public List<GPOptionGroup> getSecondaryOptions() {
-    return FILE_FORMAT_IDS[0].equals(myFileFormat) ? Collections.singletonList(myMPXOptions)
+    return myFileFormatOption.getSelectedValue() == MsProjectFileFormat.MPX ? Collections.singletonList(myMPXOptions)
         : Collections.<GPOptionGroup> emptyList();
   }
 
@@ -97,18 +81,13 @@ public Component getCustomOptionsUI() {
 
   @Override
   public String getFileNamePattern() {
-    return myFileFormat;
+    return myFileFormatOption.getSelectedValue().getExtension();
   }
 
   @Override
   protected void setFormat(String format) {
-    for (int i = 0; i < FILE_EXTENSIONS.length; i++) {
-      if (FILE_EXTENSIONS[i].equalsIgnoreCase(format)) {
-        myFileFormatOption.setValue(FILE_FORMAT_IDS[i]);
-        myFileFormatOption.commit();
-        break;
-      }
-    }
+    MsProjectFileFormat.getEntries().stream().filter( f -> f.getExtension().equalsIgnoreCase(format))
+      .findFirst().ifPresent(myFileFormatOption::setSelectedValue);
   }
 
   @Override
@@ -140,14 +119,14 @@ protected IStatus run() {
   }
 
   private ProjectWriter createProjectWriter() {
-    if (FILE_FORMAT_IDS[0].equals(myFileFormat)) {
+    if (myFileFormatOption.getSelectedValue() == MsProjectFileFormat.MPX) {
       MPXWriter result = new MPXWriter();
       if (myLanguageOption.getSelectedLocale() != null) {
         result.setLocale(myLanguageOption.getSelectedLocale());
       }
       return result;
     }
-    if (FILE_FORMAT_IDS[1].equals(myFileFormat)) {
+    if (myFileFormatOption.getSelectedValue() == MsProjectFileFormat.MSPDI) {
       return new MSPDIWriter();
     }
     assert false : "Should not be here";
@@ -160,17 +139,11 @@ public String proposeFileExtension() {
   }
 
   private String getSelectedFormatExtension() {
-    for (int i = 0; i < FILE_FORMAT_IDS.length; i++) {
-      if (myFileFormat.equals(FILE_FORMAT_IDS[i])) {
-        return FILE_EXTENSIONS[i];
-      }
-    }
-    throw new IllegalStateException("Selected format=" + myFileFormat + " has not been found in known formats:"
-        + Arrays.asList(FILE_FORMAT_IDS));
+    return myFileFormatOption.getSelectedValue().getExtension();
   }
 
   @Override
   public String[] getFileExtensions() {
-    return FILE_EXTENSIONS;
+    return MsProjectFileFormat.getEntries().stream().map(MsProjectFileFormat::getExtension).toArray(String[]::new);
   }
 }

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

@@ -472,7 +472,9 @@ class PropertyPaneBuilderImpl(private val localizer: Localizer, private val grid
     val options: PropertyDisplayOptions<*>?
   ): RowBuilder {
     private fun createLabel(item: OptionRowBuilder): Label {
-      return Label(item.label)
+      return Label(item.label).also {
+        it.styleClass.add("label")
+      }
     }
 
     override fun build(grid: GridPane, idx: Int): Int {

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

@@ -0,0 +1,45 @@
+/*
+Copyright 2026 Dmitry Barashev, BarD Software s.r.o
+
+This file is part of GanttProject, an opensource 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.core.option.DefaultEnumerationOption
+import biz.ganttproject.core.option.ObservableEnum
+import biz.ganttproject.core.option.PropertyPaneBuilder
+
+class ExportFileFormatOption<E: Enum<E>>(id: String, initialValue: E, allValues: List<E>): DefaultEnumerationOption<E>(id, allValues) {
+  private val observable = ObservableEnum(id, initialValue, allValues)
+  init {
+    selectedValue = initialValue
+    observable.addWatcher{ evt ->
+      setSelectedValue(evt.newValue)
+    }
+  }
+
+  override fun visitPropertyPaneBuilder(builder: PropertyPaneBuilder) {
+    builder.dropdown(observable, null)
+  }
+}
+
+enum class ImageFileFormat(val extension: String) {
+  PNG("png"), JPEG("jpg")
+}
+
+enum class CsvFileFormat(val extension: String) {
+  CSV("csv"), EXCEL("xls")
+}

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

@@ -1,3 +1,4 @@
+
 package net.sourceforge.ganttproject.export
 
 import biz.ganttproject.app.*
@@ -49,9 +50,13 @@ private val propertyLocalizer = i18n {
     fallback {
       default()
       transform {
-        val replaced = if (it.contains("format.value")) it.replace("format.value", "fileformat") else it
+        val replaced =
+          if (it.contains(".format.value")) it.replace(".format.value", ".fileformat")
+          else if (it.contains("fileformat.value")) it.replace(".value", "")
+          else it
         "optionValue.$replaced.label"
       }
+      //debug("exporter.dropdown.value")
     }
   }
 }

ganttproject/src/main/java/net/sourceforge/ganttproject/export/ExporterToCSV.java

@@ -22,7 +22,6 @@ of the License, or (at your option) any later version.
 import biz.ganttproject.impex.csv.GanttCSVExport;
 import biz.ganttproject.impex.csv.SpreadsheetFormat;
 import biz.ganttproject.impex.csv.SpreadsheetWriter;
-import kotlin.Unit;
 import net.sourceforge.ganttproject.GPLogger;
 import net.sourceforge.ganttproject.GanttProject;
 import net.sourceforge.ganttproject.io.CSVOptions;
@@ -36,28 +35,12 @@ of the License, or (at your option) any later version.
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
 
 public class ExporterToCSV extends ExporterBase {
-  static class FormatOption extends DefaultEnumerationOption<SpreadsheetFormat> {
-    private ObservableEnum<SpreadsheetFormat> observable = new ObservableEnum<>("impex.csv.format", SpreadsheetFormat.CSV, SpreadsheetFormat.values());
-    FormatOption() {
-      super("impex.csv.format", SpreadsheetFormat.values());
-      setSelectedValue(SpreadsheetFormat.CSV);
-      observable.addWatcher(evt -> {
-        setSelectedValue(evt.getNewValue());
-        return Unit.INSTANCE;
-      });
-    }
-
-    @Override
-    public void visitPropertyPaneBuilder(PropertyPaneBuilder builder) {
-      builder.dropdown(observable, null);
-    }
-  }
-
-  private final FormatOption myFormatOption = new FormatOption();
+  private final ExportFileFormatOption<SpreadsheetFormat> myFormatOption = new ExportFileFormatOption<>("impex.csv.format", SpreadsheetFormat.CSV, Arrays.stream(SpreadsheetFormat.values()).toList());
 
 
   private final GPOptionGroup myOptions = new GPOptionGroup("impex.csv", new GPOption[]{myFormatOption});