From 1fa67e7b57feb9709178e0e269fbead18ac4bf68 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Mon, 19 Nov 2018 17:28:21 +0000 Subject: [PATCH] JAL-3156 JAL-3127 code tidy --- src/jalview/datamodel/AlignmentView.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/jalview/datamodel/AlignmentView.java b/src/jalview/datamodel/AlignmentView.java index d3d1b2b..e6604d1 100644 --- a/src/jalview/datamodel/AlignmentView.java +++ b/src/jalview/datamodel/AlignmentView.java @@ -74,7 +74,7 @@ public class AlignmentView ScGroup() { - seqs = new ArrayList(); + seqs = new ArrayList<>(); } /** @@ -160,7 +160,6 @@ public class AlignmentView SequenceI[] selseqs; if (selection != null && selection.getSize() > 0) { - List sel = selection.getSequences(null); this.selected = new ScGroup(); selseqs = selection.getSequencesInOrder(alignment, selectedRegionOnly); @@ -170,9 +169,9 @@ public class AlignmentView selseqs = alignment.getSequencesArray(); } - List> seqsets = new ArrayList>(); + List> seqsets = new ArrayList<>(); // get the alignment's group list and make a copy - List grps = new ArrayList(); + List grps = new ArrayList<>(); List gg = alignment.getGroups(); grps.addAll(gg); ScGroup[] sgrps = null; @@ -185,7 +184,7 @@ public class AlignmentView // strip out any groups that do not actually intersect with the // visible and selected region int ssel = selection.getStartRes(), esel = selection.getEndRes(); - List isg = new ArrayList(); + List isg = new ArrayList<>(); for (SequenceGroup sg : grps) { if (!(sg.getStartRes() > esel || sg.getEndRes() < ssel)) @@ -245,7 +244,7 @@ public class AlignmentView { if (scGroups == null) { - scGroups = new ArrayList(); + scGroups = new ArrayList<>(); } addedgps[sg] = true; scGroups.add(sgrps[sg]); -- 1.7.10.2