- clean code

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
index 35128d4a50bb9acd671863c695ddef35f5745310..7d375b83f1be2935fefca64e6e72bc8b6ef881e8 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
@@ -347,19 +347,18 @@ public class EditorUtil extends AbstractUtility {
        }
 
        public static SpecimenOrObservationBase getTopMostDerivate(SpecimenOrObservationBase<?> specimen){
-           if(specimen==null) {
-               return null;
-           }
-           if(specimen.isInstanceOf(FieldUnit.class)){
-               return specimen;
-           }
-           else if(specimen instanceof DerivedUnit){
-               if(((DerivedUnit) specimen).getOriginals()==null || ((DerivedUnit) specimen).getOriginals().isEmpty()){
+           if(specimen!=null) {
+               if(specimen.isInstanceOf(FieldUnit.class)){
                    return specimen;
                }
-               else{
-                   for(SpecimenOrObservationBase original:((DerivedUnit) specimen).getOriginals()){
-                       return getTopMostDerivate(original);
+               else if(specimen instanceof DerivedUnit){
+                   if(((DerivedUnit) specimen).getOriginals()==null || ((DerivedUnit) specimen).getOriginals().isEmpty()){
+                       return specimen;
+                   }
+                   else{
+                       for(SpecimenOrObservationBase original:((DerivedUnit) specimen).getOriginals()){
+                           return getTopMostDerivate(original);
+                       }
                    }
                }
            }