JAL-3063 Castor removed from codebase

[jalview.git] / src / jalview / project / Jalview2XML.java

diff --git a/src/jalview/project/Jalview2XML.java b/src/jalview/project/Jalview2XML.java
index 3a9060e..b153d9f 100644 (file)
--- a/src/jalview/project/Jalview2XML.java
+++ b/src/jalview/project/Jalview2XML.java
@@ -49,7 +49,6 @@ import jalview.gui.AppVarna;
 import jalview.gui.ChimeraViewFrame;
 import jalview.gui.Desktop;
 import jalview.gui.FeatureRenderer;
-import jalview.gui.Jalview2XML_V1;
 import jalview.gui.JvOptionPane;
 import jalview.gui.OOMWarning;
 import jalview.gui.PaintRefresher;
@@ -2643,16 +2642,7 @@ public class Jalview2XML
       ex.printStackTrace(System.err);
       if (attemptversion1parse)
       {
-        // Is Version 1 Jar file?
-        try
-        {
-          af = new Jalview2XML_V1(raiseGUI).LoadJalviewAlign(jprovider);
-        } catch (Exception ex2)
-        {
-          System.err.println("Exception whilst loading as jalviewXMLV1:");
-          ex2.printStackTrace();
-          af = null;
-        }
+        // used to attempt to parse as V1 castor-generated xml
       }
       if (Desktop.instance != null)
       {
@@ -3098,8 +3088,6 @@ public class Jalview2XML
       }
 
       if (safeBoolean(jseq.isViewreference()))
-      // if (jseq.isViewreference() != null
-      // && jseq.isViewreference().booleanValue())
       {
         referenceseqForView = tmpseqs.get(tmpseqs.size() - 1);
       }
@@ -3385,8 +3373,7 @@ public class Jalview2XML
           // annotation.setAutoCalculated(true);
           // }
         }
-        if (autoForView || // (annotation.hasAutoCalculated() &&
-                annotation.isAutoCalculated())
+        if (autoForView || annotation.isAutoCalculated())
         {
           // remove ID - we don't recover annotation from other views for
           // view-specific annotation