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-968 incremental - PNG/EPS output has annotation overlapping alignment when annota...
[jalview.git]
/
src
/
jalview
/
structure
/
StructureSelectionManager.java
diff --git
a/src/jalview/structure/StructureSelectionManager.java
b/src/jalview/structure/StructureSelectionManager.java
index
e1aa9dc
..
35e0ea5
100644
(file)
--- a/
src/jalview/structure/StructureSelectionManager.java
+++ b/
src/jalview/structure/StructureSelectionManager.java
@@
-1,6
+1,6
@@
/*
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
/*
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-433,9
+433,14
@@
public class StructureSelectionManager
int atomNo = 0;
for (int i = 0; i < listeners.size(); i++)
{
int atomNo = 0;
for (int i = 0; i < listeners.size(); i++)
{
- if (listeners.elementAt(i) instanceof StructureListener)
+ Object listener=listeners.elementAt(i);
+ if (listener==source)
{
{
- sl = (StructureListener) listeners.elementAt(i);
+ continue;
+ }
+ if (listener instanceof StructureListener)
+ {
+ sl = (StructureListener) listener;
if (mappings == null)
{
continue;
if (mappings == null)
{
continue;
@@
-458,7
+463,7
@@
public class StructureSelectionManager
else
{
if (relaySeqMappings && hasSequenceListeners
else
{
if (relaySeqMappings && hasSequenceListeners
- && listeners.elementAt(i) instanceof SequenceListener)
+ && listener instanceof SequenceListener)
{
// DEBUG
// System.err.println("relay Seq " + seq.getDisplayId(false) + " " +
{
// DEBUG
// System.err.println("relay Seq " + seq.getDisplayId(false) + " " +
@@
-493,11
+498,11
@@
public class StructureSelectionManager
}
if (hasSequenceListeners)
{
}
if (hasSequenceListeners)
{
- ((SequenceListener) listeners.elementAt(i))
+ ((SequenceListener) listener)
.highlightSequence(results);
}
}
.highlightSequence(results);
}
}
- else if (listeners.elementAt(i) instanceof VamsasListener
+ else if (listener instanceof VamsasListener
&& !handlingVamsasMo)
{
// DEBUG
&& !handlingVamsasMo)
{
// DEBUG
@@
-506,11
+511,11
@@
public class StructureSelectionManager
// index);
// pass the mouse over and absolute position onto the
// VamsasListener(s)
// index);
// pass the mouse over and absolute position onto the
// VamsasListener(s)
- ((VamsasListener) listeners.elementAt(i)).mouseOver(seq,
+ ((VamsasListener) listener).mouseOver(seq,
indexpos, source);
}
indexpos, source);
}
- else if(listeners.elementAt(i) instanceof SecondaryStructureListener){
- ((SecondaryStructureListener) listeners.elementAt(i)).mouseOverSequence(seq,indexpos);
+ else if(listener instanceof SecondaryStructureListener){
+ ((SecondaryStructureListener) listener).mouseOverSequence(seq,indexpos);
}
}
}
}
}
}