X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FVamsasAppDatastore.java;h=387dbfa7cae83d298d58d02c700aaa7e564b0c74;hb=c6018dc0dc12720e13b75850a5303279ac7094b7;hp=d81a6b08a63d763b32fe7c85d29e163891421072;hpb=f4766a7bbcfae845fc95923b01fa14ff83d589ff;p=jalview.git

diff --git a/src/jalview/io/VamsasAppDatastore.java b/src/jalview/io/VamsasAppDatastore.java
index d81a6b0..387dbfa 100644
--- a/src/jalview/io/VamsasAppDatastore.java
+++ b/src/jalview/io/VamsasAppDatastore.java
@@ -33,6 +33,7 @@ import jalview.io.vamsas.Datasetsequence;
 import jalview.io.vamsas.DatastoreItem;
 import jalview.io.vamsas.DatastoreRegistry;
 import jalview.io.vamsas.Rangetype;
+import jalview.project.Jalview2XML;
 import jalview.util.MessageManager;
 import jalview.viewmodel.AlignmentViewport;
 
@@ -1311,7 +1312,8 @@ public class VamsasAppDatastore
           // client data is shared over all app clients
           try
           {
-            jalview.gui.Jalview2XML fromxml = new jalview.gui.Jalview2XML();
+            // jalview.gui.Jalview2XML fromxml = new jalview.gui.Jalview2XML();
+            Jalview2XML fromxml = new Jalview2XML();
             fromxml.attemptversion1parse = false;
             fromxml.setUniqueSetSuffix("");
             fromxml.setObjectMappingTables(vobj2jv, jv2vobj); // mapKeysToString
@@ -1360,7 +1362,7 @@ public class VamsasAppDatastore
         // user data overrides data shared over all app clients ?
         try
         {
-          jalview.gui.Jalview2XML fromxml = new jalview.gui.Jalview2XML();
+          Jalview2XML fromxml = new Jalview2XML();
           fromxml.attemptversion1parse = false;
           fromxml.setUniqueSetSuffix("");
           fromxml.setSkipList(skipList);
@@ -1531,7 +1533,7 @@ public class VamsasAppDatastore
     {
       try
       {
-        jalview.gui.Jalview2XML jxml = new jalview.gui.Jalview2XML();
+        Jalview2XML jxml = new Jalview2XML();
         jxml.setObjectMappingTables(mapKeysToString(vobj2jv),
                 mapValuesToString(jv2vobj));
         jxml.setSkipList(skipList);
@@ -2246,7 +2248,7 @@ public class VamsasAppDatastore
           Float val = null;
           try
           {
-            val = new Float(props[p].getContent());
+            val = Float.valueOf(props[p].getContent());
           } catch (Exception e)
           {
             Cache.log.warn("Failed to parse threshold property");
@@ -2535,7 +2537,7 @@ public class VamsasAppDatastore
           int se_end = se[1 - se[2]] + (se[2] == 0 ? 1 : -1);
           for (int p = se[se[2]]; p != se_end; p += se[2] == 0 ? 1 : -1)
           {
-            posList.add(new Integer(p));
+            posList.add(Integer.valueOf(p));
           }
         }
       }
@@ -2546,7 +2548,7 @@ public class VamsasAppDatastore
         for (int p = 0, pSize = dseta.getPosCount(); p < pSize; p++)
         {
           pos = dseta.getPos(p).getI();
-          posList.add(new Integer(pos));
+          posList.add(Integer.valueOf(pos));
         }
       }
     }