X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=2a18b0b7ad1d4fd53d2fc165ae264ae5d1a8f511;hb=1b459bcde7bbbd9149b2f94777d7336156861533;hp=9d5fd934d3ce5df299c5b75af4b8c36c9c468ceb;hpb=136c0793b90b72b928c4d77dc109dd5c644e00d3;p=jalview.git

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 9d5fd93..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;
@@ -254,7 +254,8 @@ public class FileLoader implements Runnable
   @Override
   public void run()
   {
-    String title = protocol == DataSourceType.PASTE ? "Copied From Clipboard"
+    String title = protocol == DataSourceType.PASTE
+            ? "Copied From Clipboard"
             : file;
     Runtime rt = Runtime.getRuntime();
     try
@@ -285,8 +286,7 @@ public class FileLoader implements Runnable
                 + "\" has null or unidentifiable data content!");
         if (!Jalview.isHeadlessMode())
         {
-          JvOptionPane.showInternalMessageDialog(
-                  Desktop.desktop,
+          JvOptionPane.showInternalMessageDialog(Desktop.desktop,
                   MessageManager.getString("label.couldnt_read_data")
                           + " in " + file + "\n"
                           + AppletFormatAdapter.getSupportedFormats(),
@@ -313,8 +313,8 @@ public class FileLoader implements Runnable
         if (source != null)
         {
           // Tell the user (developer?) that this is going to cause a problem
-          System.err
-                  .println("IMPLEMENTATION ERROR: Cannot read consecutive Jalview XML projects from a stream.");
+          System.err.println(
+                  "IMPLEMENTATION ERROR: Cannot read consecutive Jalview XML projects from a stream.");
           // We read the data anyway - it might make sense.
         }
         alignFrame = new Jalview2XML(raiseGUI).loadJalviewAlign(file);
@@ -339,9 +339,10 @@ public class FileLoader implements Runnable
             if (downloadStructureFile)
             {
               String structExt = format.getExtensions().split(",")[0];
-              String urlLeafName = file.substring(file.lastIndexOf(System
-                      .getProperty("file.separator")), file
-                      .lastIndexOf("."));
+              String urlLeafName = file.substring(
+                      file.lastIndexOf(
+                              System.getProperty("file.separator")),
+                      file.lastIndexOf("."));
               String tempStructureFileStr = createNamedJvTempFile(
                       urlLeafName, structExt);
               UrlDownloadClient.download(file, tempStructureFileStr);
@@ -376,8 +377,9 @@ public class FileLoader implements Runnable
               {
                 // register PDB entries with desktop's structure selection
                 // manager
-                StructureSelectionManager.getStructureSelectionManager(
-                        Desktop.instance).registerPDBEntry(pdbe);
+                StructureSelectionManager
+                        .getStructureSelectionManager(Desktop.instance)
+                        .registerPDBEntry(pdbe);
               }
             }
           }
@@ -412,8 +414,8 @@ public class FileLoader implements Runnable
               alignFrame.getViewport().setFeaturesDisplayed(fd);
               alignFrame.getViewport().setShowSequenceFeatures(
                       ((ComplexAlignFile) source).isShowSeqFeatures());
-              ColourSchemeI cs = ColourSchemeMapper.getJalviewColourScheme(
-                      colourSchemeName, al);
+              ColourSchemeI cs = ColourSchemeMapper
+                      .getJalviewColourScheme(colourSchemeName, al);
               if (cs != null)
               {
                 alignFrame.changeColour(cs);
@@ -439,8 +441,8 @@ public class FileLoader implements Runnable
                       .applyFeaturesStyle(proxyColourScheme);
             }
             alignFrame.statusBar.setText(MessageManager.formatMessage(
-                    "label.successfully_loaded_file",
-                    new String[] { title }));
+                    "label.successfully_loaded_file", new String[]
+                    { title }));
 
             if (raiseGUI)
             {
@@ -455,8 +457,8 @@ public class FileLoader implements Runnable
 
             try
             {
-              alignFrame.setMaximum(jalview.bin.Cache.getDefault(
-                      "SHOW_FULLSCREEN", false));
+              alignFrame.setMaximum(jalview.bin.Cache
+                      .getDefault("SHOW_FULLSCREEN", false));
             } catch (java.beans.PropertyVetoException ex)
             {
             }
@@ -469,11 +471,8 @@ public class FileLoader implements Runnable
             Desktop.instance.stopLoading();
           }
 
-          final String errorMessage = MessageManager
-                  .getString("label.couldnt_load_file")
-                  + " "
-                  + title
-                  + "\n" + error;
+          final String errorMessage = MessageManager.getString(
+                  "label.couldnt_load_file") + " " + title + "\n" + error;
           // TODO: refactor FileLoader to be independent of Desktop / Applet GUI
           // bits ?
           if (raiseGUI && Desktop.desktop != null)
@@ -484,7 +483,8 @@ public class FileLoader implements Runnable
               public void run()
               {
                 JvOptionPane.showInternalMessageDialog(Desktop.desktop,
-                        errorMessage, MessageManager
+                        errorMessage,
+                        MessageManager
                                 .getString("label.error_loading_file"),
                         JvOptionPane.WARNING_MESSAGE);
               }
@@ -510,11 +510,11 @@ public class FileLoader implements Runnable
           @Override
           public void run()
           {
-            JvOptionPane.showInternalMessageDialog(
-                    Desktop.desktop, MessageManager.formatMessage(
-                            "label.problems_opening_file",
-                            new String[] { file }), MessageManager
-                            .getString("label.file_open_error"),
+            JvOptionPane.showInternalMessageDialog(Desktop.desktop,
+                    MessageManager.formatMessage(
+                            "label.problems_opening_file", new String[]
+                            { file }),
+                    MessageManager.getString("label.file_open_error"),
                     JvOptionPane.WARNING_MESSAGE);
           }
         });
@@ -532,11 +532,11 @@ public class FileLoader implements Runnable
           @Override
           public void run()
           {
-            JvOptionPane.showInternalMessageDialog(
-                    Desktop.desktop, MessageManager.formatMessage(
+            JvOptionPane.showInternalMessageDialog(Desktop.desktop,
+                    MessageManager.formatMessage(
                             "warn.out_of_memory_loading_file", new String[]
-                            { file }), MessageManager
-                            .getString("label.out_of_memory"),
+                            { file }),
+                    MessageManager.getString("label.out_of_memory"),
                     JvOptionPane.WARNING_MESSAGE);
           }
         });
@@ -600,24 +600,10 @@ public class FileLoader implements Runnable
     String seprator = System.getProperty("file.separator");
     String jvTempDir = System.getProperty("java.io.tmpdir") + "jalview"
             + seprator + System.currentTimeMillis();
-    File tempStructFile = new File(jvTempDir + seprator + fileName + "."
-            + extension);
+    File tempStructFile = new File(
+            jvTempDir + seprator + fileName + "." + extension);
     tempStructFile.mkdirs();
     return tempStructFile.toString();
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see java.lang.Object#finalize()
-   */
-  @Override
-  protected void finalize() throws Throwable
-  {
-    source = null;
-    alignFrame = null;
-    viewport = null;
-    super.finalize();
-  }
-
 }