Merge branch 'develop' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
authorBen Soares <b.soares@dundee.ac.uk>
Tue, 7 Nov 2023 15:57:20 +0000 (15:57 +0000)
committerBen Soares <b.soares@dundee.ac.uk>
Tue, 7 Nov 2023 15:57:20 +0000 (15:57 +0000)
1  2 
build.gradle
src/jalview/bin/Commands.java
src/jalview/gui/Desktop.java

diff --cc build.gradle
Simple merge
@@@ -198,7 -196,7 +198,7 @@@ public class Command
      if (avm.containsArg(Arg.APPEND) || avm.containsArg(Arg.OPEN))
      {
        commandArgsProvided = true;
-       long progress = -1;
 -      final long progress = System.currentTimeMillis();
++      final long progress = IdUtils.newId(IdType.PROGRESS);
  
        boolean first = true;
        boolean progressBarSet = false;
Simple merge