X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/bec9df5af7423ad65819c1ecc92f9f0bf61225ba..050bbe43ea08f7fbc98b21915c1094c27980a4f5:/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
index 495d42352..285fd520e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
@@ -23,8 +23,8 @@ import eu.etaxonomy.taxeditor.model.IElementHasDetails;
 import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
-import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.key.GeographicalScopeDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.key.PolytomousKeyDetailSection;
@@ -79,7 +79,7 @@ public class CdmSectionPart<T> extends SectionPart implements
 					.setTaxonBase((TaxonBase) input);
 			return true;
 		}
-		if ((input instanceof DerivedUnit)
+		else if (input.getClass().equals(DerivedUnit.class)
 				&& (formSection instanceof IDerivedUnitFacadeDetailSection)) {
 
 			try {
@@ -89,11 +89,11 @@ public class CdmSectionPart<T> extends SectionPart implements
 				StoreUtil.error(getClass(), e);
 			}
 		}
-		if (input instanceof PolytomousKeyRelationship) {
+		else if (input instanceof PolytomousKeyRelationship) {
 			input = ((PolytomousKeyRelationship) input).getDestination();
 		}
 
-	    if ((input instanceof PolytomousKeyNode) &&
+		else if ((input instanceof PolytomousKeyNode) &&
 	            (formSection instanceof PolytomousKeyDetailSection ||
 	                    formSection instanceof GeographicalScopeDetailSection ||
 	                    formSection instanceof ScopeRestrictionSection ||