X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FFormatAdapter.java;h=b0414afae2e56a0373f549442dc55afd3c40ffef;hb=d18e36d8f4a511e82af3564647b3154267b177c6;hp=2264a6ae5435e1e0ba59b4104498aacb571be078;hpb=5969ead0fd401f4435a3435ede9e4e87cf9c1d0b;p=jalview.git diff --git a/src/jalview/io/FormatAdapter.java b/src/jalview/io/FormatAdapter.java index 2264a6a..b0414af 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; @@ -30,6 +30,7 @@ import jalview.datamodel.HiddenColumns; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; +import jalview.gui.Preferences; import jalview.util.Comparison; import java.io.File; @@ -56,20 +57,23 @@ public class FormatAdapter extends AppletFormatAdapter } public FormatAdapter(AlignmentViewPanel alignPanel, - AlignExportSettingI settings) + AlignExportSettingsI settings) { super(alignPanel, settings); } private void init() { - if (jalview.bin.Cache.getDefault("STRUCT_FROM_PDB", true)) + if (jalview.bin.Cache.getDefault(Preferences.STRUCT_FROM_PDB, true)) { - annotFromStructure = jalview.bin.Cache.getDefault("ADD_TEMPFACT_ANN", + annotFromStructure = jalview.bin.Cache.getDefault( + Preferences.ADD_TEMPFACT_ANN, true); - localSecondaryStruct = jalview.bin.Cache.getDefault("ADD_SS_ANN", + localSecondaryStruct = jalview.bin.Cache.getDefault( + Preferences.ADD_SS_ANN, true); - serviceSecondaryStruct = jalview.bin.Cache.getDefault("USE_RNAVIEW", + serviceSecondaryStruct = jalview.bin.Cache + .getDefault(Preferences.USE_RNAVIEW, true); } else