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-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
e546789
..
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.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;
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)
{
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)
{
}
if (Desktop.instance != null)
{