JAL-2759 Fix errant RangeElementsIterator (unit tests were failing)

[jalview.git] / src / jalview / datamodel / features / NCList.java

diff --git a/src/jalview/datamodel/features/NCList.java b/src/jalview/datamodel/features/NCList.java
index a911666..b8160d3 100644 (file)
--- 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<T extends ContiguousI>
   public NCList(T entry)
   {
     this();
-    subranges.add(new NCNode<T>(entry));
+    subranges.add(new NCNode<>(entry));
     size = 1;
   }
 
@@ -92,7 +95,7 @@ public class NCList<T extends ContiguousI>
    */
   protected List<Range> buildSubranges(List<T> ranges)
   {
-    List<Range> sublists = new ArrayList<Range>();
+    List<Range> sublists = new ArrayList<>();
     
     if (ranges.isEmpty())
     {
@@ -171,7 +174,7 @@ public class NCList<T extends ContiguousI>
       /*
        * all subranges precede this one - add it on the end
        */
-      subranges.add(new NCNode<T>(entry));
+      subranges.add(new NCNode<>(entry));
       return true;
     }
 
@@ -193,7 +196,7 @@ public class NCList<T extends ContiguousI>
         /*
          * new entry lies between subranges j-1 j
          */
-        subranges.add(j, new NCNode<T>(entry));
+        subranges.add(j, new NCNode<>(entry));
         return true;
       }
 
@@ -241,7 +244,7 @@ public class NCList<T extends ContiguousI>
              * entry spans two subranges but doesn't enclose any
              * so just add it 
              */
-            subranges.add(j, new NCNode<T>(entry));
+            subranges.add(j, new NCNode<>(entry));
             return true;
           }
         }
@@ -262,7 +265,7 @@ public class NCList<T extends ContiguousI>
     }
     else
     {
-      subranges.add(new NCNode<T>(entry));
+      subranges.add(new NCNode<>(entry));
     }
 
     return true;
@@ -320,9 +323,9 @@ public class NCList<T extends ContiguousI>
   protected synchronized void addEnclosingRange(T entry, final int i,
           final int j)
   {
-    NCList<T> newNCList = new NCList<T>();
+    NCList<T> newNCList = new NCList<>();
     newNCList.addNodes(subranges.subList(i, j + 1));
-    NCNode<T> newNode = new NCNode<T>(entry, newNCList);
+    NCNode<T> newNode = new NCNode<>(entry, newNCList);
     for (int k = j; k >= i; k--)
     {
       subranges.remove(k);
@@ -351,7 +354,7 @@ public class NCList<T extends ContiguousI>
    */
   public List<T> findOverlaps(long from, long to)
   {
-    List<T> result = new ArrayList<T>();
+    List<T> result = new ArrayList<>();
 
     findOverlaps(from, to, result);
     
@@ -551,7 +554,7 @@ public class NCList<T extends ContiguousI>
    */
   public List<T> getEntries()
   {
-    List<T> result = new ArrayList<T>();
+    List<T> result = new ArrayList<>();
     getEntries(result);
     return result;
   }