Merge branch 'release/5.11.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / agent / PersonWizardPage.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java
index 6979936a77eb83ea6ca53176c6f149364b3fa070..b27738a943004b741dc5324b738dc2a08b4ec5c4 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2007 EDIT
 * European Distributed Institute of Taxonomy
@@ -10,13 +9,15 @@
 
 package eu.etaxonomy.taxeditor.ui.section.agent;
 
+import org.apache.commons.lang.StringUtils;
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
@@ -28,6 +29,9 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
  */
 public class PersonWizardPage extends AbstractCdmEntityWizardPage<Person> {
 
+    PersonDetailElement personElement;
+
+
        /**
         * <p>Constructor for PersonWizardPage.</p>
         *
@@ -48,8 +52,16 @@ public class PersonWizardPage extends AbstractCdmEntityWizardPage<Person> {
        /** {@inheritDoc} */
        @Override
        public AbstractCdmDetailElement<Person> createElement(ICdmFormElement rootElement) {
-               PersonDetailElement personElement = formFactory.createPersonDetailElement(rootElement, SWT.NULL);
+               personElement = formFactory.createPersonDetailElement(rootElement, SWT.NULL);
                personElement.setEntity(entity);
                return personElement;
        }
+
+       @Override
+    protected boolean titleCacheIsNotEmpty() {
+        if (getEntity() instanceof AgentBase) {
+            return !StringUtils.isEmpty(entity.getTitleCache());
+        }
+        return true;
+    }
 }