JAL-3210 Barebones gradle/buildship/eclipse. See README

[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 47cceb7..0a582e5 100644 (file)
--- a/src/jalview/io/vamsas/Sequencemapping.java
+++ b/src/jalview/io/vamsas/Sequencemapping.java
@@ -110,32 +110,27 @@ 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);
@@ -369,7 +364,8 @@ public class Sequencemapping extends Rangetype
       acf.addMap(from, to, mapping);
     }
     bindjvvobj(mapping, sequenceMapping);
-    Desktop.getInstance().getStructureSelectionManager()
+    jalview.structure.StructureSelectionManager
+            .getStructureSelectionManager(Desktop.instance)
             .registerMapping(acf);
     // Try to link up any conjugate database references in the two sequences
     // matchConjugateDBRefs(from, to, mapping);
@@ -406,7 +402,7 @@ public class Sequencemapping extends Rangetype
               + from.getName() + " and " + to.getName());
     }
     List<DBRefEntry> fdb = from.getDBRefs();
-    List<DBRefEntry> tdb = new ArrayList<>(to.getDBRefs());
+    List<DBRefEntry> tdb = new ArrayList<DBRefEntry>(to.getDBRefs());
     int tdblen = to.getDBRefs().size();
 //    
 //