git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
67d5acb
)
properly import column selection from message
author
jprocter
<Jim Procter>
Fri, 6 Nov 2009 16:31:09 +0000
(16:31 +0000)
committer
jprocter
<Jim Procter>
Fri, 6 Nov 2009 16:31:09 +0000
(16:31 +0000)
src/jalview/gui/SeqPanel.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/SeqPanel.java
b/src/jalview/gui/SeqPanel.java
index
8b97853
..
e32c5cf
100755
(executable)
--- a/
src/jalview/gui/SeqPanel.java
+++ b/
src/jalview/gui/SeqPanel.java
@@
-1904,18
+1904,31
@@
public class SeqPanel extends JPanel implements MouseListener,
}
if (av.colSel == null || !av.isColSelChanged())
{
}
if (av.colSel == null || !av.isColSelChanged())
{
- // Check to see if the current selection is from a previous message
+ // the current selection is unset or from a previous message
+ // so import the new colsel.
if (colsel == null || colsel.size() == 0)
{
if (colsel == null || colsel.size() == 0)
{
- av.colSel.clear();
+ if (av.colSel!=null)
+ {
+ av.colSel.clear();
+ }
}
else
{
}
else
{
- av.colSel = new ColumnSelection(colsel);
+ if (av.colSel == null)
+ {
+ av.colSel = new ColumnSelection(colsel);
+ } else {
+ av.colSel.setElementsFrom(colsel);
+ }
}
repaint |= av.isColSelChanged();
}
}
}
repaint |= av.isColSelChanged();
}
}
+ if (av.hasHiddenColumns && (av.colSel==null || av.colSel.getHiddenColumns()==null))
+ {
+ System.err.println("Bad things");
+ }
if (repaint)
{
// probably finessing with multiple redraws here
if (repaint)
{
// probably finessing with multiple redraws here