JAL-2591 More HiddenColumns refactoring. Tests passing.

[jalview.git] / src / jalview / datamodel / HiddenColumns.java

diff --git a/src/jalview/datamodel/HiddenColumns.java b/src/jalview/datamodel/HiddenColumns.java
index 5966312..b53fc8b 100644 (file)
--- a/src/jalview/datamodel/HiddenColumns.java
+++ b/src/jalview/datamodel/HiddenColumns.java
@@ -45,7 +45,7 @@ public class HiddenColumns
    * 
    * @return empty list or List of hidden column intervals
    */
-  public List<int[]> getHiddenRegions()
+  private List<int[]> getHiddenRegions()
   {
     return hiddenColumns == null ? Collections.<int[]> emptyList()
             : hiddenColumns;
@@ -660,8 +660,14 @@ public class HiddenColumns
 
   private ArrayList<int[]> copyHiddenRegionsToArrayList()
   {
-    ArrayList<int[]> copy = new ArrayList<>(hiddenColumns.size());
-    for (int i = 0, j = hiddenColumns.size(); i < j; i++)
+    int size = 0;
+    if (hiddenColumns != null)
+    {
+      size = hiddenColumns.size();
+    }
+    ArrayList<int[]> copy = new ArrayList<>(size);
+
+    for (int i = 0, j = size; i < j; i++)
     {
       int[] rh;
       int[] cp;
@@ -673,6 +679,7 @@ public class HiddenColumns
         copy.add(cp);
       }
     }
+
     return copy;
   }