Project

General

Profile

« Previous | Next » 

Revision d12fef53

Added by Katja Luther over 4 years ago

fix #7457: add filter option for unpublished taxa in taxon search

View differences:

eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java
122 122 
    public static String SearchBar_7;
123 123 
    public static String SearchBar_8;
124 124 
    public static String SearchBar_9;
125 
    public static String SearchBar_10;
125 126 
    public static String SearchResultLabelProvider_NAME;
126 127 
    public static String SearchResultLabelProvider_SYNONYM;
127 128 
    public static String SearchResultLabelProvider_TAXON;
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties
103 103 
SearchBar_7=Synonyms
104 104 
SearchBar_8=Names (without taxa)
105 105 
SearchBar_9=Common Names
106 
SearchBar_10=Unpublished taxa
106 107 
SearchResultLabelProvider_NAME=Name:
107 108 
SearchResultLabelProvider_SYNONYM=Synonym:
108 109 
SearchResultLabelProvider_TAXON=Taxon:
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
103 103 
SearchBar_7=Synonyme
104 104 
SearchBar_8=Namen (ohne Taxa)
105 105 
SearchBar_9=Umgangsprachliche Namen
106 
SearchBar_10=Unpublizierte Taxa
106 107 
SearchResultLabelProvider_NAME=Name:
107 108 
SearchResultLabelProvider_SYNONYM=Synonym:
108 109 
SearchResultLabelProvider_TAXON=Taxon:
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
340 340 
			case COMMON_NAME:
341 341 
				configurator.setDoTaxaByCommonNames(configurator.isDoTaxaByCommonNames() ? false : true);
342 342 
				break;
343 
            case UNPUBLISHED:
344 
                configurator.setIncludeUnpublished(configurator.isIncludeUnpublished() ? false : true);
345 
                break;
346 
            default:
347 
                break;
343 348 
			}
344 349 

  		




  345
  350
  
    
			saveConfigurator();


  		












  

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





  21
  21
  
    
    TAXON(Messages.SearchBar_6),


  		




  22
  22
  
    
    SYNONYM(Messages.SearchBar_7),


  		




  23
  23
  
    
    NAME(Messages.SearchBar_8),


  		




  24
  
  
    
    COMMON_NAME(Messages.SearchBar_9);


  		




  
  24
  
    
    COMMON_NAME(Messages.SearchBar_9),


  		




  
  25
  
    
    UNPUBLISHED(Messages.SearchBar_10);


  		




  25
  26
  
    

  		




  26
  27
  
    
    private final String label;


  		




  27
  28
  
    

  		




  ......




  54
  55
  
    
        case COMMON_NAME:


  		




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


  		




  56
  57
  
    
                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES): true;


  		




  
  58
  
    
        case UNPUBLISHED:


  		




  
  59
  
    
            return PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_UNPUBLISHED)? PreferencesUtil.getPreferenceStore().getBoolean(


  		




  
  60
  
    
                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_UNPUBLISHED): true;


  		




  
  61
  
    

  		




  57
  62
  
    
        }


  		




  58
  63
  
    

  		




  59
  64
  
    
        return true;


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
    
  





  38
  38
  
    

  		




  39
  39
  
    
	public static final String TAXON_SERVICE_CONFIGURATOR_MATCH_MODE = "eu.etaxonomy.taxeditor.taxonServiceConfigurator.doSearchByMatchMode";


  		




  40
  40
  
    

  		




  
  41
  
    
	public static final String TAXON_SERVICE_CONFIGURATOR_UNPUBLISHED =  "eu.etaxonomy.taxeditor.taxonServiceConfigurator.doUnpublishedTaxa";


  		




  
  42
  
    

  		




  41
  43
  
    
	/**


  		




  42
  44
  
    
	 * Whether to show UUID and database id in the supplemental data view.


  		




  43
  45
  
    
	 */


  		




  ......




  181
  183
  
    

  		




  182
  184
  
    
    public static final String FILTER_COMMON_NAME_REFERENCES = "eu.etaxonomy.taxeditor.references.selection.filterCommonNameReferences";


  		




  183
  185
  
    

  		




  
  186
  
    

  		




  
  187
  
    

  		




  184
  188
  
    
//    public static final String IS_SEARCH_FOR_IDENTIFIER_AS_DEFAULT = "eu.etaxonomy.taxeditor.search.reference.defaultIdentifier"+ CdmStore.getActiveCdmSource().getName();


  		




  185
  189
  
    
//    public static final String SEARCH_FOR_IDENTIFIER_AND_TITLECACHE = "eu.etaxonomy.taxeditor.search.reference.identifierAndTitleCache" + CdmStore.getActiveCdmSource().getName();


  		




  186
  190
  
    

  		












Also available in:  Unified diff