X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FRNAStructExportImport.java;h=cc9aba0444651201e63740388e93d03989dc4b7d;hb=9d2408483e451285fd555c3cd6e0273977acbaa7;hp=089c29ff356931f8ece1347ff6ae01eb191b4326;hpb=136c0793b90b72b928c4d77dc109dd5c644e00d3;p=jalview.git diff --git a/test/jalview/ws/jabaws/RNAStructExportImport.java b/test/jalview/ws/jabaws/RNAStructExportImport.java index 089c29f..cc9aba0 100644 --- a/test/jalview/ws/jabaws/RNAStructExportImport.java +++ b/test/jalview/ws/jabaws/RNAStructExportImport.java @@ -20,19 +20,21 @@ */ package jalview.ws.jabaws; +import java.util.Locale; + import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertTrue; import jalview.bin.Cache; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; -import jalview.gui.Jalview2XML; import jalview.gui.JvOptionPane; import jalview.io.AnnotationFile; import jalview.io.DataSourceType; import jalview.io.FileFormat; import jalview.io.FormatAdapter; import jalview.io.StockholmFileTest; +import jalview.project.Jalview2XML; import jalview.ws.jws2.Jws2Discoverer; import jalview.ws.jws2.RNAalifoldClient; import jalview.ws.jws2.SequenceAnnotationWSClient; @@ -98,7 +100,7 @@ public class RNAStructExportImport for (Jws2Instance svc : disc.getServices()) { - if (svc.getServiceTypeURI().toLowerCase().contains("rnaalifoldws")) + if (svc.getServiceTypeURI().toLowerCase(Locale.ROOT).contains("rnaalifoldws")) { rnaalifoldws = svc; } @@ -118,7 +120,7 @@ public class RNAStructExportImport assertNotNull("Couldn't load test data ('" + testseqs + "')", af); // remove any existing annotation - List aal = new ArrayList(); + List aal = new ArrayList<>(); for (AlignmentAnnotation rna : af.getViewport().getAlignment() .getAlignmentAnnotation()) { @@ -259,7 +261,7 @@ public class RNAStructExportImport @Test(groups = { "Network" }) public void testRnaalifoldSettingsRecovery() { - List opts = new ArrayList(); + List opts = new ArrayList<>(); for (Argument rg : (List) rnaalifoldws.getRunnerConfig() .getArguments()) {