From 30cf7490641c4f7d9beaf7c2d79191078858a00e Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Tue, 29 Mar 2016 11:03:50 +0200
Subject: [PATCH] fix Ticket #5642

---
 .../name/container/MisapplicationContainer.java      | 12 ++++++++++--
 .../navigator/TaxonNodeContentProvider.java          |  9 ++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

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 29cbc0a89..d37adb99a 100644
--- 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 c7a431daf..36e87ee85 100644
--- 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;
-- 
2.34.1