Merge branch 'develop' into feature/JAL-3416_update_to_flatlaf_3.1.1_with_unpacked_na...

diff --combined src/jalview/gui/Desktop.java
index 1c55476,74ced88..8eebfc1
--- 1/src/jalview/gui/Desktop.java
--- 2/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@@ -64,7 -64,6 +64,6 @@@ import java.util.List
  import java.util.ListIterator;
  import java.util.Locale;
  import java.util.Vector;
- import java.util.concurrent.Callable;
  import java.util.concurrent.ExecutorService;
  import java.util.concurrent.Executors;
  import java.util.concurrent.Semaphore;
@@@ -442,7 -441,6 +441,7 @@@ public class Desktop extends jalview.jb
          System.err.println(
                  "Linux platform only! You may have the following warning next: \"WARNING: An illegal reflective access operation has occurred\"\nThis is expected and cannot be avoided, sorry about that.");
        }
 +      final String awtAppClassName = "awtAppClassName";
        try
        {
          Toolkit xToolkit = Toolkit.getDefaultToolkit();
@@@ -450,10 -448,10 +449,10 @@@
          Field awtAppClassNameField = null;
  
          if (Arrays.stream(declaredFields)
 -                .anyMatch(f -> f.getName().equals("awtAppClassName")))
 +                .anyMatch(f -> f.getName().equals(awtAppClassName)))
          {
            awtAppClassNameField = xToolkit.getClass()
 -                  .getDeclaredField("awtAppClassName");
 +                  .getDeclaredField(awtAppClassName);
          }
  
          String title = ChannelProperties.getProperty("app_name");
@@@ -464,12 -462,11 +463,12 @@@
          }
          else
          {
 -          jalview.bin.Console.debug("XToolkit: awtAppClassName not found");
 +          jalview.bin.Console
 +                  .debug("XToolkit: " + awtAppClassName + " not found");
          }
        } catch (Exception e)
        {
 -        jalview.bin.Console.debug("Error setting awtAppClassName");
 +        jalview.bin.Console.debug("Error setting " + awtAppClassName);
          jalview.bin.Console.trace(Cache.getStackTraceString(e));
        }
      }
@@@ -1264,7 -1261,6 +1263,6 @@@
  
        new FileLoader().LoadFile(viewport, selectedFile, DataSourceType.FILE,
                format);
-       return null;
      });
      chooser.showOpenDialog(this);
    }
@@@ -1320,7 -1316,7 +1318,7 @@@
  
      Object[] options = new Object[] { MessageManager.getString("action.ok"),
          MessageManager.getString("action.cancel") };
-     Callable<Void> action = () -> {
+     Runnable action = () -> {
        @SuppressWarnings("unchecked")
        String url = (history instanceof JTextField
                ? ((JTextField) history).getText()
@@@ -1359,8 -1355,7 +1357,7 @@@
            JvOptionPane.showInternalMessageDialog(Desktop.desktop, msg,
                    MessageManager.getString("label.url_not_found"),
                    JvOptionPane.WARNING_MESSAGE);
- 
-           return null; // Void
+           return;
          }
  
          if (viewport != null)
@@@ -1373,7 -1368,6 +1370,6 @@@
            new FileLoader().LoadFile(url, DataSourceType.URL, format);
          }
        }
-       return null; // Void
      };
      String dialogOption = MessageManager
              .getString("label.input_alignment_from_url");
@@@ -1412,7 -1406,7 +1408,7 @@@
  
    public QuitHandler.QResponse desktopQuit(boolean ui, boolean disposeFlag)
    {
-     final Callable<Void> doDesktopQuit = () -> {
+     final Runnable doDesktopQuit = () -> {
        Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
        Cache.setProperty("SCREENGEOMETRY_WIDTH", screen.width + "");
        Cache.setProperty("SCREENGEOMETRY_HEIGHT", screen.height + "");
@@@ -1438,7 -1432,7 +1434,7 @@@
        if (QuitHandler.quitCancelled())
        {
          jalview.bin.Console.debug("Desktop aborting quit");
-         return null;
+         return;
        }
  
        if (dialogExecutor != null)
@@@ -1467,8 -1461,6 +1463,6 @@@
          // instance.dispose();
        }
        instance.quit();
- 
-       return null; // Void
      };
  
      return QuitHandler.getQuitResponse(ui, doDesktopQuit, doDesktopQuit,
@@@ -1967,7 -1959,6 +1961,6 @@@
            }
          }
        }, "Project Loader").start();
-       return null;
      });
  
      chooser.showOpenDialog(this);