Merge branch 'features/JAL-2326_JOptionPane-refactoring' into develop

diff --cc test/jalview/analysis/ConservationTest.java
Simple merge

diff --cc test/jalview/analysis/FinderTest.java
Simple merge

diff --cc test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
index 292b576,2b48032..1da23ea
--- 1/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
--- 2/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
+++ b/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
@@@ -27,9 -28,8 +28,10 @@@ import jalview.gui.JvOptionPane
  import jalview.io.FileLoader;
  import jalview.io.FormatAdapter;
  
 +import java.util.Arrays;
 +
  import org.testng.Assert;
+ import org.testng.annotations.BeforeClass;
  import org.testng.annotations.Test;
  
  public class FeatureScoreModelTest

diff --cc test/jalview/controller/AlignViewControllerTest.java
Simple merge

diff --cc test/jalview/datamodel/ResidueCountTest.java
Simple merge

diff --cc test/jalview/datamodel/SequenceFeatureTest.java
Simple merge

diff --cc test/jalview/ext/android/SparseIntArrayTest.java
Simple merge

diff --cc test/jalview/ext/android/SparseShortArrayTest.java
Simple merge

diff --cc test/jalview/schemes/ResidueColourSchemeTest.java
Simple merge

diff --cc test/jalview/util/FormatTest.java
Simple merge

diff --cc test/jalview/util/PlatformTest.java
Simple merge

diff --cc test/jalview/util/SparseCountTest.java
Simple merge