Merge branch 'release/4.3.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / description / detail / TaxonInteractionDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
index b54d55833478b313fc69c731d35402e6188500e7..3a56e5c1f9e58750b6352a0052fd3c66aa10d185 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
@@ -12,11 +12,12 @@ package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 import org.eclipse.swt.SWT;
 
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.description.TaxonInteraction;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 
@@ -67,8 +68,9 @@ public class TaxonInteractionDetailElement extends
                                                entity.getTaxon2(), EntitySelectionElement.NOTHING,
                                                SWT.WRAP);
 
-               interactionDescription = formFactory.createMultilineTextWithLabel(this,
-                               "Description", 200, SWT.WRAP);
+               interactionDescription = formFactory.createMultiLineTextWithLabel(this,
+                               "Relationship to the taxon:", 200, SWT.WRAP);
+               entity = HibernateProxyHelper.deproxy(entity, TaxonInteraction.class);
                interactionDescription.setText(entity.getDescription(CdmStore
                                .getDefaultLanguage()));
        }