Merge branch 'release/4.6.0' into develop

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
index 0d063eb20cdc44156a08037de6beccd5455c3edb..6983d4811e1d9c551badcf421ab1943b4b3a0f96 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
@@ -544,9 +544,12 @@
                      definitionId="isBulkEditorSupported">
                </reference>
                <not>
-                  <reference
-                        definitionId="isBulkEditor">
-                  </reference>
+                  <with
+                        variable="activePartId">
+                     <equals
+                           value="bulkeditor.editor">
+                     </equals>
+                  </with>
                </not>
             </and>
          </activeWhen>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index 01563ffdd2f8d0ddf309bd12a2a96a8818a8c332..3ef53365ab7ac0abf02fb2351ab1750fa93379b5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -490,6 +490,9 @@ public class PreferencesUtil implements IPreferenceKeys {
                getPreferenceStore().setDefault(SHOW_NAME_DETAILS_SECTION_PROTOLOGUE, true);
                getPreferenceStore().setDefault(SHOW_NAME_DETAILS_SECTION_RANK, true);
                getPreferenceStore().setDefault(SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION, true);
+               getPreferenceStore().setDefault(SORT_NODES_NATURALLY, false);
+               getPreferenceStore().setDefault(SORT_NODES_ALPHABETICALLY, false);
+
        }
 
        /**
@@ -858,8 +861,8 @@ public class PreferencesUtil implements IPreferenceKeys {
         * <p>
         * getSortRanksNaturally
         * </p>
-        *
-        * @return a boolean.
+        *
+        * @return a boolean.
         */
        public static boolean getSortNodesNaturally() {
                return getPreferenceStore().getBoolean(SORT_NODES_NATURALLY);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
index 67b59f9cfb359b0694dcc06d2dce5b12172e9020..788f37ddff84f3cd57500fa1c812865232eec5ed 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
@@ -50,7 +50,7 @@ public class NomenclaturalStatusElement extends AbstractReferencedEntityElement<
        @Override
        public void createControls(ICdmFormElement element, int style) {
            TermVocabulary vocabulary = CdmStore.getService(IVocabularyService.class).find(VocabularyEnum.NomenclaturalStatusType.getUuid());
-               nomenclaturalStatusTypeCombo = formFactory.createDefinedTermComboElement(vocabulary, this, "Nomenclatural Status Type", null,style);
+               nomenclaturalStatusTypeCombo = formFactory.createDefinedTermComboElement(vocabulary, this, "Nomenclatural Status Type", null,false, style, true);
                ruleConsideredText = formFactory.createTextWithLabelElement(this, "Rule Considered", "", style);
 
                super.createControls(element, style);