Replaced "&" w escaped characters "&&" in CdmUtil.getDisplayName(...)

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/NameComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
index a679e841d50bc42770c057b0e13cf8bb0c8075ac..153fda94d70206bc1722bc9b162edf16039045e4 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
@@ -184,7 +184,7 @@ public abstract class NameComposite extends GroupedComposite {
                                        nameRelation.getType());\r
                                relatedName = nameRelation.getFromName();\r
                        }\r
-                       setNonEditableInfo(typeLabel + " " + relatedName.getTitleCache());\r
+                       setNonEditableInfo(typeLabel + " " + CdmUtil.getDisplayName(relatedName));\r
                }\r
        }\r
 \r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmUtil.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmUtil.java
index 3b644cdac01cfdeccf841e6e63014793506f9ce1..e005e7c0451fd5cb2d9a68ece1af25275c3a0d48 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmUtil.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmUtil.java
@@ -210,7 +210,7 @@ public class CdmUtil {
         */\r
        public static String getDisplayName(TaxonNameBase name) {\r
                if (name != null) {\r
-                       return name.getTitleCache();                    \r
+                       return name.getTitleCache().replace("&", "&&");\r
                }\r
                return "";\r
        }\r