Merge branch 'release/5.11.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / classification / TaxonNodeDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index bd54698c7e9f1798abe2b1d7300fb86a2fbfd93c..314bb63f4c4b90fcf51c8566ba4365cd4b812b9c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@ -28,6 +28,7 @@ import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.taxeditor.preference.CdmPreferenceCache;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -113,14 +114,14 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
 
                selection_parentTaxonNode = formFactory
                                .createTaxonNodeSelectionElement(getConversationHolder(), formElement, "Parent", parentTreeNode,
-                                               EntitySelectionElement.DELETABLE, style);
+                                               EntitySelectionElement.DELETABLE, style, 100);
 
 
 
                selection_Ref = formFactory
                     .createSelectionElement(Reference.class,
                             formElement, "Parent Child Relation Source", null,
-                            EntitySelectionElement.DELETABLE, style);
+                            EntitySelectionElement.DELETABLE, style, 100);
 
 
             microReference = formFactory.createTextWithLabelElement(formElement,"Detail", "", style);
@@ -140,7 +141,7 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
                selection_SecRef = formFactory
                     .createSelectionElement(Reference.class,//getConversationHolder(),
                             formElement, "Secundum Reference", taxon.getSec(),
-                            EntitySelectionElement.DELETABLE, style);
+                            EntitySelectionElement.DELETABLE, style, 100);
 
                if (isCreateNew()){
                    textNewTaxonName = formFactory.createTextWithLabelElement(formElement,"New Taxon", "", style);
@@ -491,7 +492,7 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
 
     public boolean is_publish() {
         boolean isPublishPreference = true;
-        CdmPreference defaultPublish = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
+        CdmPreference defaultPublish = CdmPreferenceCache.instance().get(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey());
         if (defaultPublish != null && defaultPublish.getValue().equals(PublishEnum.NotPublish.getKey())){
             isPublishPreference = false;
         }