From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 19 Sep 2018 08:07:49 +0000 (+0100)
Subject: JAL-3063 use JAXB for 'Save as Project' and load project from parameter
X-Git-Tag: Release_2_11_1_0~78^2~23
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=1b459bcde7bbbd9149b2f94777d7336156861533;hp=bd75c84346a9d63341d2cf3826ce99a2b37bcace;p=jalview.git

JAL-3063 use JAXB for 'Save as Project' and load project from parameter
---

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 0f0dffe..477db0c 100644
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1154,7 +1154,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                 shortName.lastIndexOf(java.io.File.separatorChar) + 1);
       }
 
-      success = new Jalview2XML().saveAlignment(this, file, shortName);
+      success = new jalview.project.Jalview2XML().saveAlignment(this, file,
+              shortName);
 
       statusBar.setText(MessageManager.formatMessage(
               "label.successfully_saved_to_file_in_format", new Object[]
diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index f26d6da..2a18b0b 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -33,9 +33,9 @@ import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
 import jalview.gui.AlignViewport;
 import jalview.gui.Desktop;
-import jalview.gui.Jalview2XML;
 import jalview.gui.JvOptionPane;
 import jalview.json.binding.biojson.v1.ColourSchemeMapper;
+import jalview.project.Jalview2XML;
 import jalview.schemes.ColourSchemeI;
 import jalview.structure.StructureSelectionManager;
 import jalview.util.MessageManager;