X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/aa2f3cbf1283944c198cda4fb0678445563d289c..cfe4872fe807aa642d91bda7f6edbdceaa1c4bb1:/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
index 32f05c608..f8f73861d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
@@ -28,7 +28,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
-import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.LoginManager;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
@@ -39,9 +39,6 @@ import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
 
 /**
- * <p>
- * Abstract AbstractCdmDetailElement class.
- * </p>
  *
  * @author n.hoffmann
  * @created Feb 26, 2010
@@ -57,20 +54,6 @@ public abstract class AbstractCdmDetailElement<T> extends AbstractCdmFormElement
 
 	private EnumSet<CRUD> requiredCrud = null;
 
-	/**
-	 * <p>
-	 * Constructor for AbstractCdmDetailElement.
-	 * </p>
-	 *
-	 * @param formFactory
-	 *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
-	 *            object.
-	 * @param formElement
-	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-	 *            object.
-	 * @param <T>
-	 *            a T object.
-	 */
 	public AbstractCdmDetailElement(CdmFormFactory formFactory,
 			ICdmFormElement formElement) {
 		super(formFactory, formElement);
@@ -97,7 +80,7 @@ public abstract class AbstractCdmDetailElement<T> extends AbstractCdmFormElement
     public void setEntity(T entity) {
         this.entity = entity;
         // the id is always 0 if the entity was not yet saved, so it is new in this case
-        if(StoreUtil.getCdmEntity(getEntity()).getId() == 0) {
+        if(getEntity() == null || StoreUtil.getCdmEntity(getEntity()).getId() == 0) {
             // new entity, not yet saved
             requiredCrud = EnumSet.of(CRUD.CREATE);
         } else {
@@ -106,18 +89,6 @@ public abstract class AbstractCdmDetailElement<T> extends AbstractCdmFormElement
         updateContent();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see eu.etaxonomy.taxeditor.forms.IEntityElement#getEntity()
-	 */
-	/**
-	 * <p>
-	 * Getter for the field <code>entity</code>.
-	 * </p>
-	 *
-	 * @return a T object.
-	 */
 	@Override
     public T getEntity() {
 		return entity;
@@ -129,19 +100,12 @@ public abstract class AbstractCdmDetailElement<T> extends AbstractCdmFormElement
 	protected void updateContent() {
 		removeElements();
 		createControls(this, entity, SWT.WRAP);
-		getLayoutComposite().layout();
+		reflowParentScrolledForm(true);
 
 		updateControlStates();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * eu.etaxonomy.taxeditor.forms.ISelectableComposite#setSelected(boolean)
-	 */
-	/** {@inheritDoc} */
-	@Override
+    @Override
     public void setSelected(boolean selected) {
 		Composite section = getLayoutComposite().getParent();
 		section.setBackground(selected ? SELECTED : getPersistentBackground());
@@ -171,9 +135,6 @@ public abstract class AbstractCdmDetailElement<T> extends AbstractCdmFormElement
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement#isEnabled()
-	 */
 	@Override
 	public boolean isEnabled() {
 	    return enabled;
@@ -283,6 +244,7 @@ public abstract class AbstractCdmDetailElement<T> extends AbstractCdmFormElement
 		if (getParentElement() instanceof AbstractCdmDetailSection) {
 			((AbstractCdmDetailSection) getParentElement()).updateTitle();
 		}
+		reflowParentScrolledForm(true);
 	}
 
 	/**
@@ -294,40 +256,15 @@ public abstract class AbstractCdmDetailElement<T> extends AbstractCdmFormElement
 	 */
 	public abstract void handleEvent(Object eventSource);
 
-	/**
-	 * <p>
-	 * handleException
-	 * </p>
-	 *
-	 * @param event
-	 *            a
-	 *            {@link eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent}
-	 *            object.
-	 */
 	public void handleException(CdmPropertyChangeEvent event) {
 		// override this in subclasses if you want to deal with the error
-		AbstractUtility.error(event.getSource().getClass(), event.getException());
+		MessagingUtils.error(event.getSource().getClass(), event.getException());
 	}
 
-	/**
-	 * <p>
-	 * isIrrelevant
-	 * </p>
-	 *
-	 * @return a boolean.
-	 */
 	public boolean isIrrelevant() {
 		return irrelevant;
 	}
 
-	/**
-	 * <p>
-	 * getConversationHolder
-	 * </p>
-	 *
-	 * @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder}
-	 *         object.
-	 */
 	@Override
     public ConversationHolder getConversationHolder() {
 		if (getParentElement() instanceof IConversationEnabled) {