* Removed showSettingsDialog method

* Fixed an issue with building Swing components in JavaFX thread

Author: dbarashev

ganttproject/src/main/java/biz/ganttproject/settings/SettingsDialog.kt

@@ -43,6 +43,7 @@ import net.sourceforge.ganttproject.gui.UIFacade
 import net.sourceforge.ganttproject.gui.options.OptionPageProviderPanel
 import net.sourceforge.ganttproject.gui.options.model.OptionPageProvider
 import net.sourceforge.ganttproject.plugins.PluginManager
+import javax.swing.SwingUtilities
 
 data class OptionPageItem(
   override var title: String,
@@ -60,7 +61,9 @@ data class OptionPageItem(
         it.buildNode()
       } else {
         SwingNode().also {
-          it.content = OptionPageProviderPanel(provider, project, uiFacade).component
+          SwingUtilities.invokeLater {
+            it.content = OptionPageProviderPanel(provider, project, uiFacade).component
+          }
         }
       }
     } ?: Label(title)

ganttproject/src/main/java/net/sourceforge/ganttproject/GanttProjectBase.java

@@ -428,11 +428,6 @@ public void showNotificationDialog(NotificationChannel channel, String message)
     myUIFacade.showNotificationDialog(channel, message);
   }
 
-  @Override
-  public void showSettingsDialog(String pageID) {
-    myUIFacade.showSettingsDialog(pageID);
-  }
-
   @Override
   public NotificationManager getNotificationManager() {
     return myUIFacade.getNotificationManager();

ganttproject/src/main/java/net/sourceforge/ganttproject/UIFacadeImpl.java

@@ -49,7 +49,6 @@ of the License, or (at your option) any later version.
 import net.sourceforge.ganttproject.gui.*;
 import net.sourceforge.ganttproject.gui.options.OptionsPageBuilder;
 import net.sourceforge.ganttproject.gui.options.OptionsPageBuilder.I18N;
-import net.sourceforge.ganttproject.gui.options.SettingsDialog2;
 import net.sourceforge.ganttproject.gui.options.model.GP1XOptionConverter;
 import net.sourceforge.ganttproject.gui.scrolling.ScrollingManager;
 import net.sourceforge.ganttproject.gui.scrolling.ScrollingManagerImpl;
@@ -400,12 +399,6 @@ public void showNotificationDialog(NotificationChannel channel, String message)
     )));
   }
 
-  @Override
-  public void showSettingsDialog(String pageID) {
-    SettingsDialog2 dialog = new SettingsDialog2(myProject, this, "settings.app.pageOrder", "settings.app");
-    dialog.show(pageID);
-  }
-
   protected void onViewLog() {
     ViewLogDialog.show();
   }
@@ -619,11 +612,18 @@ public void run() {
   private void updateFonts() {
     if (myOriginalFonts.isEmpty()) {
       UIDefaults defaults = UIManager.getDefaults();
-      for (Enumeration<Object> keys = defaults.keys(); keys.hasMoreElements(); ) {
-        String key = String.valueOf(keys.nextElement());
-        Object obj = UIManager.get(key);
-        if (obj instanceof Font f) {
-          myOriginalFonts.put(key, f);
+      for (int i = 0; i < 3; i++) {
+        try {
+          for (Enumeration<Object> keys = defaults.keys(); keys.hasMoreElements(); ) {
+            String key = String.valueOf(keys.nextElement());
+            Object obj = UIManager.get(key);
+            if (obj instanceof Font f) {
+              myOriginalFonts.put(key, f);
+            }
+          }
+          break;
+        } catch (ConcurrentModificationException e) {
+          continue;
         }
       }
     }

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

@@ -124,12 +124,7 @@ public void showErrorDialog(Throwable e) {
     e.printStackTrace();
   }
 
-  public void showSettingsDialog(String pageID) {
-    // TODO Auto-generated method stub
-
-  }
-
-  @Override
+    @Override
   public GanttChart getGanttChart() {
     return myRealFacade == null ? null : myRealFacade.getGanttChart();
   }

ganttproject/src/main/java/net/sourceforge/ganttproject/gui/UIFacade.java

@@ -110,7 +110,6 @@ public enum Choice {
 
   void showNotificationDialog(NotificationChannel channel, String message);
 
-  void showSettingsDialog(String pageID);
   /**
    * Shows the given exception in an error dialog and also puts it into the log
    * file