X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFormatAdapter.java;h=85cf48a4b4e5994417a1ac637f25524b46f9f949;hb=66993ec5b2bbc67ed10836d2288d938f6c368076;hp=3027ab1bb1cb83bb9077afda60194196ab96e248;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git

diff --git a/src/jalview/io/FormatAdapter.java b/src/jalview/io/FormatAdapter.java
index 3027ab1..85cf48a 100755
--- a/src/jalview/io/FormatAdapter.java
+++ b/src/jalview/io/FormatAdapter.java
@@ -20,7 +20,7 @@
  */
 package jalview.io;
 
-import jalview.api.AlignExportSettingI;
+import jalview.api.AlignExportSettingsI;
 import jalview.api.AlignmentViewPanel;
 import jalview.bin.Cache;
 import jalview.datamodel.Alignment;
@@ -32,6 +32,7 @@ import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 import jalview.util.Comparison;
 
+import java.io.File;
 import java.io.IOException;
 
 /**
@@ -55,7 +56,7 @@ public class FormatAdapter extends AppletFormatAdapter
   }
 
   public FormatAdapter(AlignmentViewPanel alignPanel,
-          AlignExportSettingI settings)
+          AlignExportSettingsI settings)
   {
     super(alignPanel, settings);
   }
@@ -161,7 +162,8 @@ public class FormatAdapter extends AppletFormatAdapter
 
   public boolean getCacheSuffixDefault(FileFormatI format)
   {
-    return Cache.getDefault(format.getName() + "_JVSUFFIX", true);
+    return Cache.getDefault(format.getName().toUpperCase() + "_JVSUFFIX",
+            true);
   }
 
   public String formatSequences(FileFormatI format, AlignmentI alignment,
@@ -211,12 +213,12 @@ public class FormatAdapter extends AppletFormatAdapter
           AlignmentAnnotation na = new AlignmentAnnotation(ala[i]);
           if (selgp != null)
           {
-            hidden.makeVisibleAnnotation(selgp.getStartRes(),
-                    selgp.getEndRes(), na);
+            na.makeVisibleAnnotation(selgp.getStartRes(), selgp.getEndRes(),
+                    hidden);
           }
           else
           {
-            hidden.makeVisibleAnnotation(na);
+            na.makeVisibleAnnotation(hidden);
           }
           alv.addAnnotation(na);
         }
@@ -234,6 +236,13 @@ public class FormatAdapter extends AppletFormatAdapter
     return al;
   }
 
+  public AlignmentI readFile(File file, DataSourceType sourceType,
+          FileFormatI fileFormat) throws IOException
+  {
+    AlignmentI al = super.readFile(file, null, sourceType, fileFormat);
+    return al;
+  }
+
   @Override
   public AlignmentI readFromFile(FileParse source, FileFormatI format)
           throws IOException