JAL-3063 Castor removed from codebase

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index bbdddbb..b4a38a9 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -38,6 +38,7 @@ import jalview.io.JalviewFileChooser;
 import jalview.io.JalviewFileView;
 import jalview.jbgui.GSplitFrame;
 import jalview.jbgui.GStructureViewer;
+import jalview.project.Jalview2XML;
 import jalview.structure.StructureSelectionManager;
 import jalview.urls.IdOrgSettings;
 import jalview.util.ImageMaker;
@@ -1599,16 +1600,13 @@ public class Desktop extends jalview.jbgui.GDesktop
   }
 
   /**
-   * DOCUMENT ME!
-   * 
-   * @param e
-   *          DOCUMENT ME!
+   * Shows a file chooser dialog and writes out the current session as a Jalview
+   * project file
    */
   @Override
-  public void saveState_actionPerformed(boolean asCastor)
+  public void saveState_actionPerformed()
   {
-    JalviewFileChooser chooser = new JalviewFileChooser(
-            asCastor ? "jvp" : "jvx",
+    JalviewFileChooser chooser = new JalviewFileChooser("jvp",
             "Jalview Project");
 
     chooser.setFileView(new JalviewFileView());
@@ -1637,14 +1635,7 @@ public class Desktop extends jalview.jbgui.GDesktop
           // TODO prevent user from messing with the Desktop whilst we're saving
           try
           {
-            if (asCastor)
-            {
-              new Jalview2XML().saveState(choice);
-            }
-            else
-            {
-              new jalview.project.Jalview2XML().saveState(choice);
-            }
+            new Jalview2XML().saveState(choice);
           } catch (OutOfMemoryError oom)
           {
             new OOMWarning(
@@ -1680,22 +1671,15 @@ public class Desktop extends jalview.jbgui.GDesktop
   }
 
   /**
-   * DOCUMENT ME!
-   * 
-   * @param e
-   *          DOCUMENT ME!
+   * Shows a file chooser dialog and tries to read in the selected file as a
+   * Jalview project
    */
   @Override
-  public void loadState_actionPerformed(boolean asCastor)
-  {
-    final String[] suffix = asCastor ? new String[] { "jvp", "jar" }
-            : new String[]
-            { "jvx" };
-    final String[] desc = asCastor
-            ? new String[]
-            { "Jalview Project", "Jalview Project (old)" }
-            : new String[]
-            { "Jalview Project" };
+  public void loadState_actionPerformed()
+  {
+    final String[] suffix = new String[] { "jvp", "jar" };
+    final String[] desc = new String[] { "Jalview Project",
+        "Jalview Project (old)" };
     JalviewFileChooser chooser = new JalviewFileChooser(
             Cache.getProperty("LAST_DIRECTORY"), suffix,
             desc,
@@ -1721,14 +1705,7 @@ public class Desktop extends jalview.jbgui.GDesktop
                   { choice }), choice.hashCode());
           try
           {
-            if (asCastor)
-            {
-              new Jalview2XML().loadJalviewAlign(choice);
-            }
-            else
-            {
-              new jalview.project.Jalview2XML().loadJalviewAlign(choice);
-            }
+            new Jalview2XML().loadJalviewAlign(choice);
           } catch (OutOfMemoryError oom)
           {
             new OOMWarning("Whilst loading project from " + choice, oom);