JAL-1894 update year/version in copyright

[jalview.git] / src / jalview / io / FileLoader.java

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 870d438..ce01843 100755 (executable)
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -31,6 +31,7 @@ import jalview.gui.AlignFrame;
 import jalview.gui.AlignViewport;
 import jalview.gui.Desktop;
 import jalview.gui.Jalview2XML;
+import jalview.json.binding.biojson.v1.ColourSchemeMapper;
 import jalview.schemes.ColourSchemeI;
 import jalview.structure.StructureSelectionManager;
 import jalview.util.MessageManager;
@@ -375,8 +376,8 @@ public class FileLoader implements Runnable
                       .getHiddenSequences();
               boolean showSeqFeatures = ((ComplexAlignFile) source)
                       .isShowSeqFeatures();
-              ColourSchemeI cs = ((ComplexAlignFile) source)
-                      .getColourScheme();
+              String colourSchemeName = ((ComplexAlignFile) source)
+                      .getGlobalColourScheme();
               FeaturesDisplayedI fd = ((ComplexAlignFile) source)
                       .getDisplayedFeatures();
               alignFrame = new AlignFrame(al, hiddenSeqs, colSel,
@@ -385,7 +386,12 @@ public class FileLoader implements Runnable
               alignFrame.getViewport().setShowSequenceFeatures(
                       showSeqFeatures);
               alignFrame.getViewport().setFeaturesDisplayed(fd);
-              alignFrame.changeColour(cs);
+              ColourSchemeI cs = ColourSchemeMapper.getJalviewColourScheme(
+                      colourSchemeName, al);
+              if (cs != null)
+              {
+                alignFrame.changeColour(cs);
+              }
             }
             else
             {
@@ -399,8 +405,8 @@ public class FileLoader implements Runnable
             }
 
             alignFrame.statusBar.setText(MessageManager.formatMessage(
-                    "label.successfully_loaded_file", new String[]
-                    { title }));
+                    "label.successfully_loaded_file",
+                    new String[] { title }));
 
             if (raiseGUI)
             {
@@ -429,8 +435,11 @@ public class FileLoader implements Runnable
             Desktop.instance.stopLoading();
           }
 
-          final String errorMessage = "Couldn't 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)
@@ -467,8 +476,8 @@ public class FileLoader implements Runnable
           {
             javax.swing.JOptionPane.showInternalMessageDialog(
                     Desktop.desktop, MessageManager.formatMessage(
-                            "label.problems_opening_file", new String[]
-                            { file }), MessageManager
+                            "label.problems_opening_file",
+                            new String[] { file }), MessageManager
                             .getString("label.file_open_error"),
                     javax.swing.JOptionPane.WARNING_MESSAGE);
           }