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.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
338 338 
				configurator.setDoNamesWithoutTaxa(configurator.isDoNamesWithoutTaxa() ? false : true);
339 339 
				break;
340 340 
			case COMMON_NAME:
341 
				configurator.setDoTaxaByCommonNames(getConfigurator().isDoTaxaByCommonNames() ? false : true);
341 
				configurator.setDoTaxaByCommonNames(configurator.isDoTaxaByCommonNames() ? false : true);
342 342 
				break;
343 343 
			}
344 344 

  		




  ......




  350
  350
  
    
		}


  		




  351
  351
  
    

  		




  352
  352
  
    
		private void saveConfigurator() {


  		




  353
  
  
    
			PreferencesUtil.setSearchConfigurator(getConfigurator());


  		




  354
  
  
    
			this.configurator = PreferencesUtil.getSearchConfigurator();


  		




  
  353
  
    
			PreferencesUtil.setSearchConfigurator(configurator);


  		




  
  354
  
    
			PreferencesUtil.firePreferencesChanged(this.getClass());


  		




  
  355
  
    

  		




  355
  356
  
    
		}


  		




  356
  357
  
    
	}


  		




  357
  358
  
    

  		












  

    
      eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchOption.java
    
  





  8
  8
  
    
 */


  		




  9
  9
  
    
package eu.etaxonomy.taxeditor.navigation.search;


  		




  10
  10
  
    

  		




  11
  
  
    
import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator;


  		




  12
  11
  
    
import eu.etaxonomy.taxeditor.navigation.l10n.Messages;


  		




  13
  12
  
    
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;


  		




  14
  13
  
    
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;


  		




  ......




  35
  34
  
    
    }


  		




  36
  35
  
    

  		




  37
  36
  
    
    public boolean getPreference() {


  		




  38
  
  
    
        if (!PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA)) {


  		




  39
  
  
    
            // initializes the search configurator


  		




  40
  
  
    
            IFindTaxaAndNamesConfigurator configurator = PreferencesUtil.initializeSearchConfigurator();


  		




  41
  
  
    
            PreferencesUtil.setSearchConfigurator(configurator);


  		




  42
  
  
    
        }


  		




  
  37
  
    
//        if (!PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA)) {


  		




  
  38
  
    
//            // initializes the search configurator


  		




  
  39
  
    
//            IFindTaxaAndNamesConfigurator configurator = PreferencesUtil.initializeSearchConfigurator();


  		




  
  40
  
    
//            PreferencesUtil.setSearchConfigurator(configurator);


  		




  
  41
  
    
//        }


  		




  43
  42
  
    

  		




  44
  43
  
    
        switch (this) {


  		




  45
  44
  
    
        case TAXON:


  		




  46
  
  
    
            boolean result = PreferencesUtil.getPreferenceStore().getBoolean(


  		




  47
  
  
    
                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA);


  		




  
  45
  
    
            boolean result = PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA)? PreferencesUtil.getPreferenceStore().getBoolean(


  		




  
  46
  
    
                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA): true;


  		




  48
  47
  
    
            return result;


  		




  49
  48
  
    
        case SYNONYM:


  		




  50
  
  
    
            return PreferencesUtil.getPreferenceStore().getBoolean(


  		




  51
  
  
    
                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_SYNONYMS);


  		




  
  49
  
    
            return  PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_SYNONYMS)? PreferencesUtil.getPreferenceStore().getBoolean(


  		




  
  50
  
    
                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_SYNONYMS): true;


  		




  52
  51
  
    
        case NAME:


  		




  53
  
  
    
            return PreferencesUtil.getPreferenceStore().getBoolean(


  		




  54
  
  
    
                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_NAMES);


  		




  
  52
  
    
            return PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_NAMES)? PreferencesUtil.getPreferenceStore().getBoolean(


  		




  
  53
  
    
                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_NAMES): true;


  		




  55
  54
  
    
        case COMMON_NAME:


  		




  56
  
  
    
            return PreferencesUtil.getPreferenceStore().getBoolean(


  		




  57
  
  
    
                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES);


  		




  
  55
  
    
            return PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES)? PreferencesUtil.getPreferenceStore().getBoolean(


  		




  
  56
  
    
                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES): true;


  		




  58
  57
  
    
        }


  		




  59
  58
  
    

  		




  60
  59
  
    
        return true;


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
    
  





  450
  450
  
    
    public static String AbcdImportPreference_import_all_children_for_cultures_or_tissues;


  		




  451
  451
  
    
    public static String AbcdImportPreference_import_all_children_for_cultures_or_tissues_tooltip;


  		




  452
  452
  
    
    public static String AbcdImportPreference_map_unit_nr_catalog_number;


  		




  453
  
  
    
    public static String AbcdImportPreference_map_unit_number_accession_number_tooltip;


  		




  
  453
  
    

  		




  454
  454
  
    
    public static String AbcdImportPreference_map_unit_number_barcode;


  		




  455
  455
  
    
    public static String AbcdImportPreference_map_unit_number_barcode_tooltip;


  		




  456
  456
  
    
    public static String AbcdImportPreference_map_unit_number_catalog_number_tooltip;


  		












  

    
      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