Use Cache.getProperty

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 1f6fabd..3211b03 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -32,26 +32,25 @@ public class AlignFrame extends GAlignFrame
   public AlignFrame(AlignmentI al)\r
   {\r
     super();\r
-\r
-    AlignmentUtil.addUniprotFeatures(al);\r
-\r
     viewport = new AlignViewport(al,true,true,true,false);\r
     alignPanel = new AlignmentPanel(this, viewport);\r
     getContentPane().add(alignPanel, java.awt.BorderLayout.CENTER);\r
     fontNameMenuItem.setText(viewport.getFont().getName());\r
     fontSizeMenuItem.setText(viewport.getFont().getSize()+"");\r
+\r
+    AlignmentUtil.fetchSequenceFeatures(al, alignPanel);\r
   }\r
 \r
   protected void saveAs_actionPerformed(ActionEvent e)\r
   {\r
-    JFileChooser chooser = new JFileChooser(jalview.bin.Cache.LAST_DIRECTORY);\r
+    JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));\r
     chooser.setDialogTitle("Save Alignment to file - "+e.getActionCommand() +" format.");\r
     chooser.setToolTipText("Save");\r
     int value = chooser.showSaveDialog(this);\r
     if(value == JFileChooser.APPROVE_OPTION)\r
     {\r
       String choice =  chooser.getSelectedFile().getPath();\r
-      jalview.bin.Cache.LAST_DIRECTORY = choice;\r
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);\r
       String output = FormatAdapter.get(e.getActionCommand(), viewport.getAlignment().getSequences());\r
       try{\r
         java.io.PrintWriter out = new java.io.PrintWriter( new java.io.FileWriter( choice )  );\r