JAL-2647 more iterators

[jalview.git] / src / jalview / gui / AlignViewport.java

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index c22a37d..657f8f3 100644 (file)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -476,9 +476,9 @@ public class AlignViewport extends AlignmentViewport
    *          area
    * @return
    */
-  public int[] getViewAsVisibleContigs(boolean selectedRegionOnly)
+  public List<int[]> getViewAsVisibleContigs(boolean selectedRegionOnly)
   {
-    int[] viscontigs = null;
+    List<int[]> viscontigs = null;
     int start = 0, end = 0;
     if (selectedRegionOnly && selectionGroup != null)
     {
@@ -614,10 +614,10 @@ public class AlignViewport extends AlignmentViewport
    */
   public SequenceI[][] collateForPDB(PDBEntry[] pdbEntries)
   {
-    List<SequenceI[]> seqvectors = new ArrayList<SequenceI[]>();
+    List<SequenceI[]> seqvectors = new ArrayList<>();
     for (PDBEntry pdb : pdbEntries)
     {
-      List<SequenceI> choosenSeqs = new ArrayList<SequenceI>();
+      List<SequenceI> choosenSeqs = new ArrayList<>();
       for (SequenceI sq : alignment.getSequences())
       {
         Vector<PDBEntry> pdbRefEntries = sq.getDatasetSequence()
@@ -679,7 +679,7 @@ public class AlignViewport extends AlignmentViewport
     return validCharWidth;
   }
 
-  private Hashtable<String, AutoCalcSetting> calcIdParams = new Hashtable<String, AutoCalcSetting>();
+  private Hashtable<String, AutoCalcSetting> calcIdParams = new Hashtable<>();
 
   public AutoCalcSetting getCalcIdSettingsFor(String calcId)
   {