JAL-1641 refactored out view settings from Desktop.java

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 5038e4d..9e5bbff 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -26,11 +26,11 @@ import jalview.bin.Cache;
 import jalview.io.FileLoader;
 import jalview.io.FormatAdapter;
 import jalview.io.IdentifyFile;
+import jalview.io.JSONFile;
 import jalview.io.JalviewFileChooser;
 import jalview.io.JalviewFileView;
 import jalview.jbgui.GSplitFrame;
 import jalview.jbgui.GStructureViewer;
-import jalview.schemes.ColourSchemeI;
 import jalview.structure.StructureSelectionManager;
 import jalview.util.ImageMaker;
 import jalview.util.MessageManager;
@@ -172,10 +172,6 @@ public class Desktop extends jalview.jbgui.GDesktop implements
 
   private static AlignFrame currentAlignFrame;
 
-  private static ColourSchemeI currentGlobalColourScheme;
-
-  private static boolean currentSeqFeaturesVisible;
-
   public static jalview.ws.jws1.Discoverer discoverer;
 
   public static Object[] jalviewClipboard;
@@ -1029,11 +1025,11 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       {
         new FileLoader().LoadFile(viewport, choice, FormatAdapter.FILE,
                 format);
-        viewport.setShowSequenceFeatures(isCurrentSeqFeaturesVisible());
+        viewport.setShowSequenceFeatures(JSONFile.isSeqFeaturesEnabled());
         AlignFrame af = viewport.getAlignPanel().alignFrame;
         if (af != null)
         {
-          af.changeColour(getCurrentGlobalColourScheme());
+          af.changeColour(JSONFile.getColourScheme());
           af.setMenusForViewport();
         }
       }
@@ -3098,26 +3094,5 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     Desktop.currentAlignFrame = currentAlignFrame;
   }
 
-  public static ColourSchemeI getCurrentGlobalColourScheme()
-  {
-    return currentGlobalColourScheme;
-  }
-
-  public static void setCurrentGlobalColourScheme(
-          ColourSchemeI currentGlobalColourScheme)
-  {
-    Desktop.currentGlobalColourScheme = currentGlobalColourScheme;
-  }
-
-  public static boolean isCurrentSeqFeaturesVisible()
-  {
-    return currentSeqFeaturesVisible;
-  }
-
-  public static void setCurrentSeqFeaturesVisible(
-          boolean currentSeqFeaturesVisible)
-  {
-    Desktop.currentSeqFeaturesVisible = currentSeqFeaturesVisible;
-  }
 
 }