X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fstructure%2FStructureSelectionManager.java;fp=src%2Fjalview%2Fstructure%2FStructureSelectionManager.java;h=9a9e2a233fd2e366b9443fa74bc4eff19186d06a;hb=89f6194d4bba6f8c9efa916e02e6fba2130c5e0f;hp=5865b7fc08057a9c27719a852944b123ff77ef14;hpb=faf491e024f9835435f5dd6c20a033250dd9297d;p=jalview.git diff --git a/src/jalview/structure/StructureSelectionManager.java b/src/jalview/structure/StructureSelectionManager.java index 5865b7f..9a9e2a2 100644 --- a/src/jalview/structure/StructureSelectionManager.java +++ b/src/jalview/structure/StructureSelectionManager.java @@ -1670,15 +1670,24 @@ public class StructureSelectionManager public static void doConfigureStructurePrefs( StructureSelectionManager ssm) { - if (Cache.getDefault(Preferences.ADD_SS_ANN, true)) + doConfigureStructurePrefs(ssm, + Cache.getDefault(Preferences.ADD_SS_ANN, true), + Cache.getDefault(Preferences.ADD_TEMPFACT_ANN, true), + Cache.getDefault(Preferences.STRUCT_FROM_PDB, true), + Cache.getDefault(Preferences.USE_RNAVIEW, false)); + } + + public static void doConfigureStructurePrefs( + StructureSelectionManager ssm, boolean add_ss_ann, + boolean add_tempfact_ann, boolean struct_from_pdb, + boolean use_rnaview) + { + if (add_ss_ann) { - ssm.setAddTempFacAnnot( - Cache.getDefault(Preferences.ADD_TEMPFACT_ANN, true)); - ssm.setProcessSecondaryStructure( - Cache.getDefault(Preferences.STRUCT_FROM_PDB, true)); + ssm.setAddTempFacAnnot(add_tempfact_ann); + ssm.setProcessSecondaryStructure(struct_from_pdb); // JAL-3915 - RNAView is no longer an option so this has no effect - ssm.setSecStructServices( - Cache.getDefault(Preferences.USE_RNAVIEW, false)); + ssm.setSecStructServices(use_rnaview); } else {