From 54dcb58375e9783c7bd4b793acd0b0aa485556ba Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Tue, 22 Aug 2017 22:12:07 +0100 Subject: [PATCH] JAL-2681 source formatting --- test/jalview/io/CrossRef2xmlTests.java | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/test/jalview/io/CrossRef2xmlTests.java b/test/jalview/io/CrossRef2xmlTests.java index ec5855f..9e24262 100644 --- a/test/jalview/io/CrossRef2xmlTests.java +++ b/test/jalview/io/CrossRef2xmlTests.java @@ -65,10 +65,9 @@ public class CrossRef2xmlTests extends Jalview2xmlBase public void testRetrieveAndShowCrossref() throws Exception { - List failedDBRetr = new ArrayList(); - List failedXrefMenuItems = new ArrayList(); - List failedProjectRecoveries = new ArrayList(); - + List failedDBRetr = new ArrayList<>(); + List failedXrefMenuItems = new ArrayList<>(); + List failedProjectRecoveries = new ArrayList<>(); // for every set of db queries // retrieve db query // verify presence of expected xrefs @@ -85,9 +84,9 @@ public class CrossRef2xmlTests extends Jalview2xmlBase // . codonframes // // - HashMap dbtoviewBit = new HashMap(); - List keyseq = new ArrayList(); - HashMap savedProjects = new HashMap(); + HashMap dbtoviewBit = new HashMap<>(); + List keyseq = new ArrayList<>(); + HashMap savedProjects = new HashMap<>(); for (String[] did : new String[][] { { "ENSEMBL", "ENSG00000157764" }, { "UNIPROT", "P01731" } }) @@ -176,7 +175,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase // build next key so we an retrieve all views String nextxref = first + " -> " + db + "{" + firstcr_ap + "}"; // perform crossref action, or retrieve stored project - List cra_views = new ArrayList(); + List cra_views = new ArrayList<>(); CrossRefAction cra = null; if (pass2 == 0) @@ -237,7 +236,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase } } - HashMap> xrptypes = new HashMap>(); + HashMap> xrptypes = new HashMap<>(); // first save/verify views. for (AlignmentViewPanel avp : cra_views) { @@ -274,7 +273,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase nextxref = first + " -> " + db + "{" + firstcr_ap++ + "}"; for (String xrefdb : xrptypes.get(nextxref)) { - List cra_views2 = new ArrayList(); + List cra_views2 = new ArrayList<>(); int q = 0; String nextnextxref = nextxref + " -> " + xrefdb + "{" + q + "}"; @@ -480,7 +479,7 @@ public class CrossRef2xmlTests extends Jalview2xmlBase private void assertType(boolean expectProtein, AlignmentViewPanel alignmentViewPanel, String message) { - List nonType = new ArrayList(); + List nonType = new ArrayList<>(); for (SequenceI sq : alignmentViewPanel.getAlignViewport() .getAlignment().getSequences()) { -- 1.7.10.2