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-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...
[jalview.git]
/
src
/
jalview
/
io
/
vamsas
/
Sequencemapping.java
diff --git
a/src/jalview/io/vamsas/Sequencemapping.java
b/src/jalview/io/vamsas/Sequencemapping.java
index
0a582e5
..
542bd3f
100644
(file)
--- a/
src/jalview/io/vamsas/Sequencemapping.java
+++ b/
src/jalview/io/vamsas/Sequencemapping.java
@@
-110,27
+110,32
@@
public class Sequencemapping extends Rangetype
}
}
}
}
+ @Override
public void addToDocument()
{
add(mjvmapping, from, ds);
}
public void addToDocument()
{
add(mjvmapping, from, ds);
}
+ @Override
public void addFromDocument()
{
add((SequenceMapping) vobj);
}
public void addFromDocument()
{
add((SequenceMapping) vobj);
}
+ @Override
public void conflict()
{
conflict(mjvmapping, (SequenceMapping) vobj);
}
public void conflict()
{
conflict(mjvmapping, (SequenceMapping) vobj);
}
+ @Override
public void updateToDoc()
{
update(mjvmapping, (SequenceMapping) vobj);
}
public void updateToDoc()
{
update(mjvmapping, (SequenceMapping) vobj);
}
+ @Override
public void updateFromDoc()
{
update((SequenceMapping) vobj, (jalview.datamodel.Mapping) jvobj);
public void updateFromDoc()
{
update((SequenceMapping) vobj, (jalview.datamodel.Mapping) jvobj);
@@
-364,8
+369,7
@@
public class Sequencemapping extends Rangetype
acf.addMap(from, to, mapping);
}
bindjvvobj(mapping, sequenceMapping);
acf.addMap(from, to, mapping);
}
bindjvvobj(mapping, sequenceMapping);
- jalview.structure.StructureSelectionManager
- .getStructureSelectionManager(Desktop.instance)
+ Desktop.getStructureSelectionManager()
.registerMapping(acf);
// Try to link up any conjugate database references in the two sequences
// matchConjugateDBRefs(from, to, mapping);
.registerMapping(acf);
// Try to link up any conjugate database references in the two sequences
// matchConjugateDBRefs(from, to, mapping);
@@
-402,7
+406,7
@@
public class Sequencemapping extends Rangetype
+ from.getName() + " and " + to.getName());
}
List<DBRefEntry> fdb = from.getDBRefs();
+ from.getName() + " and " + to.getName());
}
List<DBRefEntry> fdb = from.getDBRefs();
- List<DBRefEntry> tdb = new ArrayList<DBRefEntry>(to.getDBRefs());
+ List<DBRefEntry> tdb = new ArrayList<>(to.getDBRefs());
int tdblen = to.getDBRefs().size();
//
//
int tdblen = to.getDBRefs().size();
//
//