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 Further refactoring (still incomplete)
[jalview.git]
/
src
/
jalview
/
appletgui
/
AnnotationColumnChooser.java
diff --git
a/src/jalview/appletgui/AnnotationColumnChooser.java
b/src/jalview/appletgui/AnnotationColumnChooser.java
index
c49a5f3
..
bb67efc
100644
(file)
--- a/
src/jalview/appletgui/AnnotationColumnChooser.java
+++ b/
src/jalview/appletgui/AnnotationColumnChooser.java
@@
-46,7
+46,7
@@
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.TextEvent;
import java.awt.event.TextListener;
import java.awt.event.MouseListener;
import java.awt.event.TextEvent;
import java.awt.event.TextListener;
-import java.util.Iterator;
+import java.util.ArrayList;
import java.util.Vector;
//import javax.swing.JPanel;
import java.util.Vector;
//import javax.swing.JPanel;
@@
-300,12
+300,14
@@
public class AnnotationColumnChooser extends AnnotationRowFilter implements
.getOldHiddenColumns();
if (oldHidden != null)
{
.getOldHiddenColumns();
if (oldHidden != null)
{
- for (Iterator<int[]> itr = oldHidden.iterator(); itr.hasNext();)
+ ArrayList<int[]> regions = oldHidden.getHiddenColumnsCopyAsList();
+ for (int[] positions : regions)
{
{
- int positions[] = itr.next();
av.hideColumns(positions[0], positions[1]);
}
}
av.hideColumns(positions[0], positions[1]);
}
}
+ // TODO not clear why we need to hide all the columns (above) if we are
+ // going to copy the hidden columns over wholesale anyway
av.getAlignment().setHiddenColumns(oldHidden);
}
ap.paintAlignment(true);
av.getAlignment().setHiddenColumns(oldHidden);
}
ap.paintAlignment(true);