Project

General

Profile

« Previous | Next » 

Revision 5d616c75

Added by Katja Luther over 4 years ago

fix taxon search configurator preference

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
819 819
    public static IFindTaxaAndNamesConfigurator getSearchConfigurator() {
820 820
        IFindTaxaAndNamesConfigurator configurator = initializeSearchConfigurator();
821 821

  
822
        configurator.setDoTaxa(getPreferenceStore().getBoolean(
823
                TAXON_SERVICE_CONFIGURATOR_TAXA));
824
        configurator.setDoSynonyms(getPreferenceStore().getBoolean(
825
                TAXON_SERVICE_CONFIGURATOR_SYNONYMS));
826
        configurator.setDoNamesWithoutTaxa(getPreferenceStore().getBoolean(
827
                TAXON_SERVICE_CONFIGURATOR_NAMES));
828
        configurator.setDoTaxaByCommonNames(getPreferenceStore().getBoolean(
829
                TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES));
822
        configurator.setDoTaxa(PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA)? PreferencesUtil.getPreferenceStore().getBoolean(
823
                IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA): true);
824
        configurator.setDoSynonyms(PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_SYNONYMS)? PreferencesUtil.getPreferenceStore().getBoolean(
825
                IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_SYNONYMS): true);
826
        configurator.setDoNamesWithoutTaxa(PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_NAMES)? PreferencesUtil.getPreferenceStore().getBoolean(
827
                IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_NAMES): true);
828
        configurator.setDoTaxaByCommonNames(PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES)? PreferencesUtil.getPreferenceStore().getBoolean(
829
                IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES): true);
830 830
        //configurator.setMatchMode(eu.etaxonomy.cdm.persistence.query.MatchMode.valueOf(getStringValue(TAXON_SERVICE_CONFIGURATOR_MATCH_MODE)));
831 831

  
832 832
        return configurator;
......
905 905
     * Set default values for preferences
906 906
     */
907 907
    public static void setDefaults() {
908
        getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_TAXA, true);
909
        getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_SYNONYMS,
910
                true);
908

  
911 909
        getPreferenceStore().setDefault(createPreferenceString(EDIT_MAP_SERVICE_ACCES_POINT),
912 910
                "http://edit.africamuseum.be/edit_wp5/v1.2/rest_gen.php");
913 911
        //FIXME : changed default for SHOULD_CONNECT_AT_STARTUP to false (ticket 3828) until resolution
......
921 919
        getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_NAMES, true);
922 920
        getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES, true);
923 921

  
924
        //Distribution Editor:
925
//      getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DistributionEditorActivated.getKey()), Boolean.valueOf(PreferencePredicate.DistributionEditorActivated.getDefaultValue().toString()));
926
//      getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString());
927
//      getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisplayOfStatus.getKey()), PreferencePredicate.DisplayOfStatus.getDefaultValue().toString());
928

  
929 922

  
930 923
        //Name Details
931 924
        getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.NameDetailsView.getKey()), new NameDetailsConfigurator(false).toString());

Also available in: Unified diff