Merge branch 'develop' into merged_2_11_2_0_to_2_12

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

diff --git a/src/jalview/io/FormatAdapter.java b/src/jalview/io/FormatAdapter.java
index 31751f5..735619f 100755 (executable)
--- a/src/jalview/io/FormatAdapter.java
+++ b/src/jalview/io/FormatAdapter.java
@@ -65,14 +65,11 @@ public class FormatAdapter extends AppletFormatAdapter
 
   private void init()
   {
-    if (jalview.bin.Cache.getDefault("STRUCT_FROM_PDB", true))
+    if (Cache.getDefault("STRUCT_FROM_PDB", true))
     {
-      annotFromStructure = jalview.bin.Cache.getDefault("ADD_TEMPFACT_ANN",
-              true);
-      localSecondaryStruct = jalview.bin.Cache.getDefault("ADD_SS_ANN",
-              true);
-      serviceSecondaryStruct = jalview.bin.Cache.getDefault("USE_RNAVIEW",
-              true);
+      annotFromStructure = Cache.getDefault("ADD_TEMPFACT_ANN", true);
+      localSecondaryStruct = Cache.getDefault("ADD_SS_ANN", true);
+      serviceSecondaryStruct = Cache.getDefault("USE_RNAVIEW", true);
     }
     else
     {
@@ -164,8 +161,8 @@ public class FormatAdapter extends AppletFormatAdapter
 
   public boolean getCacheSuffixDefault(FileFormatI format)
   {
-    return Cache.getDefault(format.getName().toUpperCase(Locale.ROOT) + "_JVSUFFIX",
-            true);
+    return Cache.getDefault(
+            format.getName().toUpperCase(Locale.ROOT) + "_JVSUFFIX", true);
   }
 
   public String formatSequences(FileFormatI format, AlignmentI alignment,