Project

General

Profile

Revision 88672879

ID88672879a258f470f4474706705398afeef436e0
Parent b512f232
Child d50317d6

Added by Katja Luther almost 2 years ago

ref #7854: use preferred terms for PA terms if none are selected for distribution editor

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
58 58
            uuidList.add(UUID.fromString(status));
59 59
        }
60 60

  
61
        List<DefinedTermBase> inputList = CdmStore.getTermManager().getTerms(uuidList, PresenceAbsenceTerm.class);
61
        List<PresenceAbsenceTerm> inputList = CdmStore.getTermManager().getTerms(uuidList, PresenceAbsenceTerm.class);
62
        if (uuidList.isEmpty()){
63
            inputList = CdmStore.getTermManager().getPreferredTerms(PresenceAbsenceTerm.class);
64
        }
62 65
        Comparator<DefinedTermBase> comp = new OrderedTermComparator<>();
63 66
        Collections.sort(inputList, comp);
64 67
        Collections.sort(inputList, Collections.reverseOrder());
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
102 102
    public static String ChangeConnectionHandler_REALLY_CREATE_DATAMODEL;
103 103
    public static String ChangeConnectionHandler_DATASOURCE_NOT_AVAILABLE;
104 104
    public static String ChangeConnectionHandler_NOT_AVAILABLE_REASONS;
105

  
105
    public static String CheckBoxTreeComposite_SELECT_DIRECT_CHILDREN;
106 106
    public static String UpdateHandler_CHECK_UPDATE_JOB;
107 107
    public static String UpdateHandler_INSTALL_JOB;
108 108
    public static String UpdateHandler_NO_UPDATE_MESSAGE;
......
471 471
    public static String AvailableVocabularyWizard_WINDOW_TITLE;
472 472
    public static String AvailableVocabularyWizard_WIZARD_TITLE;
473 473

  
474

  
475
    public static String CheckBoxTreeComposite_SELECT_DIRECT_CHILDREN;
476

  
477

  
478 474
    public static String ChecklistEditorGeneralPreference_enable;
479 475
    public static String GeneralPreference_allowOverride;
480 476
    public static String ChecklistEditorGeneralPreference_open_distribution_selection;
......
552 548
    public static String Distribution_status_selection;
553 549
    public static String DistributionAdminPreferences_SELECT_STATUS;
554 550

  
555

  
556 551
    public static String DatabasePreferncesPage_Show_MediaView;
557 552
    public static String DatabasePreferncesPage_Show_ChecklistPerspective;
558 553
    public static String DatabasePreferncesPage_Show_TaxonNodeWizard;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
449 449

  
450 450
Distribution_status_selection=Status Selection
451 451
DistributionAdminPreferences_SELECT_STATUS=List of available distribution status
452
DistributionEditor_0=Default Source Reference: 
453
DistributionEditor_default_source=Default Source: 
452 454

  
453 455
MarkerTypeMenuPreferences_display=Choose available markers
454 456
MeasurementUnitMenuPreferences_edit=Edit displayed measurement units

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)