fix #6681 show ,non Author also if appended phrase exists

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/MisapplicationContainer.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/MisapplicationContainer.java
index 71d4c0a9adcdfc431fd18d8c5986f8c5da9a738a..b05c3a9e88bd002afad873ed570b664926bf7ed4 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/MisapplicationContainer.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/MisapplicationContainer.java
@@ -9,8 +9,6 @@
 
 package eu.etaxonomy.taxeditor.editor.name.container;
 
-import javax.persistence.GenerationType;
-
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.swt.graphics.Font;
 
@@ -30,7 +28,6 @@ import eu.etaxonomy.taxeditor.preference.Resources;
  *
  * @author p.ciardelli
  * @created 13.01.2009
- * @version 1.0
  */
 public class MisapplicationContainer extends AbstractGroupedContainer<Taxon> {
        TaxonRelationship misapplication;
@@ -47,10 +44,6 @@ public class MisapplicationContainer extends AbstractGroupedContainer<Taxon> {
                
        }
 
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.editor.name.NameComposite#initializeComposite()
-        */
        /** {@inheritDoc} */
        @Override
        protected void initializeComposite() {
@@ -80,8 +73,8 @@ public class MisapplicationContainer extends AbstractGroupedContainer<Taxon> {
                }
                String title = "";
                String author = "";
-               TaxonName misappliedNameName = HibernateProxyHelper.deproxy(getMisappliedName().getName(), TaxonName.class);
-               if (misappliedNameName.getAuthorshipCache() != null && !StringUtils.isBlank(misappliedNameName.getAuthorshipCache())&& getMisappliedName().getAppendedPhrase() == null){
+               TaxonName misappliedNameName = HibernateProxyHelper.deproxy(getMisappliedName().getName());
+               if (StringUtils.isNotBlank(misappliedNameName.getAuthorshipCache())){
                        author = ", non " + misappliedNameName.getAuthorshipCache();
                }
                if (misapplication.getCitation() == null) {
@@ -98,10 +91,6 @@ public class MisapplicationContainer extends AbstractGroupedContainer<Taxon> {
                            sec = getMisappliedName().getAppendedPhrase() + " "+sec; //$NON-NLS-1$
                        }
                        title += sec + getMisappliedName().getSec().getTitleCache();
-                       
-                       
-                       
-                       
                }
                title += author;
                title = title.replace("&", "&&"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -123,9 +112,6 @@ public class MisapplicationContainer extends AbstractGroupedContainer<Taxon> {
                return EditorUtil.getFont(Resources.MISAPPLIEDNAME_FONT);
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.editor.name.container.AbstractGroupedContainer#showAnnotations()
-        */
        @Override
        public void showAnnotations() {
                if(getData().getSec() == null){
@@ -142,10 +128,6 @@ public class MisapplicationContainer extends AbstractGroupedContainer<Taxon> {
                showSec();
        }
 
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.editor.name.AbstractGroupedContainer#updateIndent()
-        */
        @Override
        protected void updateIndent() {
                setIndent(MISAPPLIEDNAME_INDENT);