X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2Fvamsas%2FSequencemapping.java;h=47cceb7e780717899ae0cbf1a41b96345e669a3d;hb=e226ed0ad6ba8552a0b70fb083cf00060588855d;hp=402ffdf63363ede3e745082833d4d8c9b8351272;hpb=87256ba36fb105a1115067ffe2563412e9281d2d;p=jalview.git diff --git a/src/jalview/io/vamsas/Sequencemapping.java b/src/jalview/io/vamsas/Sequencemapping.java index 402ffdf..47cceb7 100644 --- 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); } + @Override public void addFromDocument() { add((SequenceMapping) vobj); } + @Override public void conflict() { conflict(mjvmapping, (SequenceMapping) vobj); } + @Override public void updateToDoc() { update(mjvmapping, (SequenceMapping) vobj); } + @Override 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); - jalview.structure.StructureSelectionManager - .getStructureSelectionManager(Desktop.getInstance()) + Desktop.getInstance().getStructureSelectionManager() .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 fdb = from.getDBRefs(); - List tdb = new ArrayList(to.getDBRefs()); + List tdb = new ArrayList<>(to.getDBRefs()); int tdblen = to.getDBRefs().size(); // //