X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2Ffeatures%2FNCList.java;h=ae58a69768184cc87f02453eac2c02c6980d3dc8;hb=e42eed3a0089a8a064560df4cf17a5021fd1e16a;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..ae58a69 100644
--- a/src/jalview/datamodel/features/NCList.java
+++ b/src/jalview/datamodel/features/NCList.java
@@ -1,5 +1,28 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
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 +97,7 @@ public class NCList
public NCList(T entry)
{
this();
- subranges.add(new NCNode(entry));
+ subranges.add(new NCNode<>(entry));
size = 1;
}
@@ -92,7 +115,7 @@ public class NCList
*/
protected List buildSubranges(List ranges)
{
- List sublists = new ArrayList();
+ List sublists = new ArrayList<>();
if (ranges.isEmpty())
{
@@ -171,7 +194,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 +216,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 +264,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 +285,7 @@ public class NCList
}
else
{
- subranges.add(new NCNode(entry));
+ subranges.add(new NCNode<>(entry));
}
return true;
@@ -320,9 +343,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 +374,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 +574,7 @@ public class NCList
*/
public List getEntries()
{
- List result = new ArrayList();
+ List result = new ArrayList<>();
getEntries(result);
return result;
}