fix for #5638

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / name / ProtologueSection.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
index d7cfc0601fa9b52572104959efcc8bba0b70da98..05a117bd660c5eb14c1aea07f11f0b78e2e2ac2b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -23,8 +23,8 @@ import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-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.section.AbstractEntityCollectionSection;
 import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
@@ -36,7 +36,7 @@ import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
  * @version 1.0
  */
 public class ProtologueSection extends AbstractEntityCollectionSection<TaxonNameBase, DescriptionElementBase> implements ITaxonBaseDetailSection{
-       
+
        private TaxonBase taxonBase;
 
        /**
@@ -97,16 +97,17 @@ public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName
                List<TaxonNameDescription> descriptions = getTaxonNameDescriptions(getEntity());
                for (TaxonNameDescription desc : descriptions){
                        desc.removeElement(element);
-               } 
+               }
        }
 
        /** {@inheritDoc} */
-       public void setTaxonBase(TaxonBase entity) {
+       @Override
+    public void setTaxonBase(TaxonBase entity) {
                this.taxonBase = entity;
-               NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(entity.getName());
+               NonViralName name = HibernateProxyHelper.deproxy(entity.getName(), NonViralName.class);
                setEntity(name);
        }
-       
+
        /**
         * NOTE: returns first description
         * @param name
@@ -118,7 +119,7 @@ public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName
                }
                return (TaxonNameDescription) name.getDescriptions().iterator().next();
        }
-       
+
        /**
         * Try to fix FIXME in {@link #getTaxonNameDescription(TaxonNameBase)}
         * @param name
@@ -126,9 +127,12 @@ public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName
         */
        private List<TaxonNameDescription> getTaxonNameDescriptions(TaxonNameBase<?,?> name){
                List<TaxonNameDescription> result = new ArrayList<TaxonNameDescription>();
-               if(name.getDescriptions().size() == 0){
-                       name.addDescription(TaxonNameDescription.NewInstance(name));
+               if (name == null){
+                       return result;
                }
+//             if(name.getDescriptions().size() == 0){
+//                     name.addDescription(TaxonNameDescription.NewInstance(name));
+//             }
                for (TaxonNameDescription desc : name.getDescriptions()){
                        result.add(desc);
                }