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
Column hide/show updated
[jalview.git]
/
src
/
jalview
/
gui
/
AlignViewport.java
diff --git
a/src/jalview/gui/AlignViewport.java
b/src/jalview/gui/AlignViewport.java
index
1970181
..
3ae0a52
100755
(executable)
--- a/
src/jalview/gui/AlignViewport.java
+++ b/
src/jalview/gui/AlignViewport.java
@@
-1126,12
+1126,9
@@
public class AlignViewport
if (colSel.size() < 1)
\r
return;
\r
\r
if (colSel.size() < 1)
\r
return;
\r
\r
- while (colSel.size() > 0)
\r
- {
\r
- int column = ( (Integer) colSel.getSelected().firstElement()).intValue();
\r
- colSel.hideColumns(column);
\r
- }
\r
+ colSel.hideSelectedColumns();
\r
setSelectionGroup(null);
\r
setSelectionGroup(null);
\r
+
\r
hasHiddenColumns = true;
\r
}
\r
\r
hasHiddenColumns = true;
\r
}
\r
\r
@@
-1139,14
+1136,9
@@
public class AlignViewport
public void hideColumns(int start, int end)
\r
{
\r
if(start==end)
\r
public void hideColumns(int start, int end)
\r
{
\r
if(start==end)
\r
- end++;
\r
-
\r
- for(int i=start; i<end; i++)
\r
- {
\r
- colSel.addElement(i);
\r
- colSel.hideColumns(i);
\r
- }
\r
-
\r
+ colSel.hideColumns(start);
\r
+ else
\r
+ colSel.hideColumns(start, end);
\r
setSelectionGroup(null);
\r
hasHiddenColumns = true;
\r
}
\r
setSelectionGroup(null);
\r
hasHiddenColumns = true;
\r
}
\r
@@
-1171,7
+1163,7
@@
public class AlignViewport
public void showColumn(int col)
\r
{
\r
colSel.revealHiddenColumns(col);
\r
public void showColumn(int col)
\r
{
\r
colSel.revealHiddenColumns(col);
\r
- if(colSel.size()<1)
\r
+ if(colSel.getHiddenColumns()==null)
\r
hasHiddenColumns = false;
\r
}
\r
\r
hasHiddenColumns = false;
\r
}
\r
\r