X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAnnotationColumnChooser.java;h=0a4748cb60d9f97279cf5a0f63abc202aa90e19c;hb=0af3213cac54f10113b6fa2cbfb4523dae61b5b7;hp=60775d33790abae4e5679705748b0d72a5641995;hpb=defcce0ef74ffc0923b4387bcb5f0d867bf64831;p=jalview.git diff --git a/src/jalview/appletgui/AnnotationColumnChooser.java b/src/jalview/appletgui/AnnotationColumnChooser.java index 60775d3..0a4748c 100644 --- a/src/jalview/appletgui/AnnotationColumnChooser.java +++ b/src/jalview/appletgui/AnnotationColumnChooser.java @@ -142,7 +142,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements } setOldHiddenColumns(av.getAlignment().getHiddenColumns()); adjusting = true; - Vector list = new Vector(); + Vector list = new Vector<>(); int index = 1; for (int i = 0; i < anns.length; i++) { @@ -298,7 +298,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements HiddenColumns oldHidden = av .getAnnotationColumnSelectionState() .getOldHiddenColumns(); - if (oldHidden != null && oldHidden.getHiddenRegions() != null + if (oldHidden != null && !oldHidden.getHiddenRegions().isEmpty()) { for (Iterator itr = oldHidden.getHiddenRegions()