X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2Ffeatures%2FNCList.java;h=b8160d3c7077516d528477ed10a3ea53edc2470a;hb=34b682702fe2dee7a5d79f95960a1accbea17ef6;hp=a911666f37c4d07e82fa8d342db573795ce0deda;hpb=4bb1a8a4b8fc08ed5b0d51f0ea03d9a9ad7dc419;p=jalview.git diff --git a/src/jalview/datamodel/features/NCList.java b/src/jalview/datamodel/features/NCList.java index a911666..b8160d3 100644 --- a/src/jalview/datamodel/features/NCList.java +++ b/src/jalview/datamodel/features/NCList.java @@ -1,5 +1,8 @@ package jalview.datamodel.features; +import jalview.datamodel.ContiguousI; +import jalview.datamodel.Range; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -74,7 +77,7 @@ public class NCList public NCList(T entry) { this(); - subranges.add(new NCNode(entry)); + subranges.add(new NCNode<>(entry)); size = 1; } @@ -92,7 +95,7 @@ public class NCList */ protected List buildSubranges(List ranges) { - List sublists = new ArrayList(); + List sublists = new ArrayList<>(); if (ranges.isEmpty()) { @@ -171,7 +174,7 @@ public class NCList /* * all subranges precede this one - add it on the end */ - subranges.add(new NCNode(entry)); + subranges.add(new NCNode<>(entry)); return true; } @@ -193,7 +196,7 @@ public class NCList /* * new entry lies between subranges j-1 j */ - subranges.add(j, new NCNode(entry)); + subranges.add(j, new NCNode<>(entry)); return true; } @@ -241,7 +244,7 @@ public class NCList * entry spans two subranges but doesn't enclose any * so just add it */ - subranges.add(j, new NCNode(entry)); + subranges.add(j, new NCNode<>(entry)); return true; } } @@ -262,7 +265,7 @@ public class NCList } else { - subranges.add(new NCNode(entry)); + subranges.add(new NCNode<>(entry)); } return true; @@ -320,9 +323,9 @@ public class NCList protected synchronized void addEnclosingRange(T entry, final int i, final int j) { - NCList newNCList = new NCList(); + NCList newNCList = new NCList<>(); newNCList.addNodes(subranges.subList(i, j + 1)); - NCNode newNode = new NCNode(entry, newNCList); + NCNode newNode = new NCNode<>(entry, newNCList); for (int k = j; k >= i; k--) { subranges.remove(k); @@ -351,7 +354,7 @@ public class NCList */ public List findOverlaps(long from, long to) { - List result = new ArrayList(); + List result = new ArrayList<>(); findOverlaps(from, to, result); @@ -551,7 +554,7 @@ public class NCList */ public List getEntries() { - List result = new ArrayList(); + List result = new ArrayList<>(); getEntries(result); return result; }