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
refactor to allow distinct StructureSelectionManager instances for
[jalview.git]
/
src
/
jalview
/
gui
/
AlignViewport.java
diff --git
a/src/jalview/gui/AlignViewport.java
b/src/jalview/gui/AlignViewport.java
old mode 100755
(executable)
new mode 100644
(file)
index
35743ab
..
af3ab95
--- a/
src/jalview/gui/AlignViewport.java
+++ b/
src/jalview/gui/AlignViewport.java
@@
-40,6
+40,7
@@
import java.util.*;
import java.awt.*;
import jalview.analysis.*;
import java.awt.*;
import jalview.analysis.*;
+import jalview.api.StructureSelectionManagerProvider;
import jalview.bin.*;
import jalview.bin.*;
@@
-54,7
+55,7
@@
import jalview.structure.VamsasSource;
* DOCUMENT ME!
*
* @author $author$
* DOCUMENT ME!
*
* @author $author$
- * @version $Revision$
+ * @version $Revision: 1.141 $
*/
public class AlignViewport implements SelectionSource, VamsasSource
{
*/
public class AlignViewport implements SelectionSource, VamsasSource
{
@@
-940,13
+941,13
@@
public class AlignViewport implements SelectionSource, VamsasSource
{
if (alignment != null && alignment.getCodonFrames() != null)
{
{
if (alignment != null && alignment.getCodonFrames() != null)
{
- StructureSelectionManager.getStructureSelectionManager()
+ StructureSelectionManager.getStructureSelectionManager(Desktop.instance)
.removeMappings(alignment.getCodonFrames());
}
this.alignment = align;
if (alignment.getCodonFrames() != null)
{
.removeMappings(alignment.getCodonFrames());
}
this.alignment = align;
if (alignment.getCodonFrames() != null)
{
- StructureSelectionManager.getStructureSelectionManager().addMappings(
+ StructureSelectionManager.getStructureSelectionManager(Desktop.instance).addMappings(
alignment.getCodonFrames());
}
}
alignment.getCodonFrames());
}
}
@@
-2050,7
+2051,7
@@
public class AlignViewport implements SelectionSource, VamsasSource
public void sendSelection()
{
jalview.structure.StructureSelectionManager
public void sendSelection()
{
jalview.structure.StructureSelectionManager
- .getStructureSelectionManager().sendSelection(
+ .getStructureSelectionManager(Desktop.instance).sendSelection(
new SequenceGroup(getSelectionGroup()),
new ColumnSelection(getColumnSelection()), this);
}
new SequenceGroup(getSelectionGroup()),
new ColumnSelection(getColumnSelection()), this);
}
@@
-2242,4
+2243,9
@@
public class AlignViewport implements SelectionSource, VamsasSource
}
}
}
}
}
}
+
+ public StructureSelectionManager getStructureSelectionManager()
+ {
+ return StructureSelectionManager.getStructureSelectionManager(Desktop.instance);
+ }
}
}