git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2591 Removed getHiddenRegions()==null checks which are always false
[jalview.git]
/
src
/
jalview
/
appletgui
/
AnnotationColumnChooser.java
diff --git
a/src/jalview/appletgui/AnnotationColumnChooser.java
b/src/jalview/appletgui/AnnotationColumnChooser.java
index
60775d3
..
0a4748c
100644
(file)
--- 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;
}
setOldHiddenColumns(av.getAlignment().getHiddenColumns());
adjusting = true;
- Vector<String> list = new Vector<String>();
+ Vector<String> list = new Vector<>();
int index = 1;
for (int i = 0; i < anns.length; i++)
{
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();
HiddenColumns oldHidden = av
.getAnnotationColumnSelectionState()
.getOldHiddenColumns();
- if (oldHidden != null && oldHidden.getHiddenRegions() != null
+ if (oldHidden != null
&& !oldHidden.getHiddenRegions().isEmpty())
{
for (Iterator<int[]> itr = oldHidden.getHiddenRegions()
&& !oldHidden.getHiddenRegions().isEmpty())
{
for (Iterator<int[]> itr = oldHidden.getHiddenRegions()