fix Ticket #5642

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 29cbc0a89badace6e2d06ca906ae5c9d50ed064a..d37adb99a22d7fbee1d7d1c31e005ea1affa676f 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
@@ -61,11 +61,19 @@ public class MisapplicationContainer extends AbstractGroupedContainer<Taxon> {
                }
 
                if (getMisappliedName().getSec() == null) {
-                       setNonEditableInfo("sec. ???", false);
+                   if (getMisappliedName().getAppendedPhrase() != null ){
+                       setNonEditableInfo(getMisappliedName().getAppendedPhrase(), false);
+                   }else{
+                       setNonEditableInfo("sec. ???", false);
+                   }
                } else {
                        String title = getMisappliedName().getSec().getTitleCache();
                        title = title.replace("&", "&&");
-                       setNonEditableInfo("sec. " + title, false);
+                       String sec = "sec. ";
+                       if (getMisappliedName().getAppendedPhrase() != null ){
+                           sec = getMisappliedName().getAppendedPhrase() + " "+sec;
+                       }
+                       setNonEditableInfo(sec + title, false);
                }
        }
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java
index c7a431daf0b0df9e1c6b47149300112a9fe82d91..36e87ee8548e6066c0a1e850871bf4dda435a173 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java
@@ -10,6 +10,8 @@
 
 package eu.etaxonomy.taxeditor.navigation.navigator;
 
+import java.util.List;
+
 import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
@@ -38,7 +40,12 @@ public class TaxonNodeContentProvider implements ITreeContentProvider {
 
                if(parentElement instanceof ITaxonTreeNode){
                    ITaxonTreeNode treeNode = (ITaxonTreeNode) HibernateProxyHelper.deproxy(parentElement);
-                       children = treeNode.getChildNodes().toArray();
+                       List<TaxonNode> childrenSet = treeNode.getChildNodes();
+                       while (childrenSet.contains(null)){
+                           childrenSet.remove(null);
+                       }
+                   children = childrenSet.toArray();
+
                }
 
                return children != null ? children : NO_CHILDREN;