From 1e18ca7a3b540e34a4851bca94c570ce718f114b Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Mon, 21 Mar 2016 13:52:37 +0100 Subject: [PATCH] fix #5646 --- .../container/MisapplicationContainer.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 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 ae2a122fd..29cbc0a89 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 @@ -1,8 +1,8 @@ /** * 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,7 +23,7 @@ import eu.etaxonomy.taxeditor.preference.Resources; * @version 1.0 */ public class MisapplicationContainer extends AbstractGroupedContainer { - + /** *

Constructor for MisapplicationContainer.

* @@ -34,7 +34,7 @@ public class MisapplicationContainer extends AbstractGroupedContainer { public MisapplicationContainer(AbstractGroup group, Taxon misappliedName) { super(misappliedName); } - + /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.editor.name.NameComposite#initializeComposite() @@ -44,9 +44,9 @@ public class MisapplicationContainer extends AbstractGroupedContainer { protected void initializeComposite() { setIsDraggable(true); setFont(getViewerFont()); - - showSec(); - + + showSec(); + initTextViewer(); } @@ -54,20 +54,21 @@ public class MisapplicationContainer extends AbstractGroupedContainer { protected void updateIcon() { setIcon(MISAPPLIEDNAME_ICON); } - + private void showSec() { if (getMisappliedName() == null) { return; } - + if (getMisappliedName().getSec() == null) { setNonEditableInfo("sec. ???", false); } else { String title = getMisappliedName().getSec().getTitleCache(); + title = title.replace("&", "&&"); setNonEditableInfo("sec. " + title, false); } } - + /** *

getMisappliedName

* @@ -82,7 +83,7 @@ public class MisapplicationContainer extends AbstractGroupedContainer { protected Font getViewerFont() { return EditorUtil.getFont(Resources.MISAPPLIEDNAME_FONT); } - + /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.editor.name.container.AbstractGroupedContainer#showAnnotations() */ @@ -94,7 +95,7 @@ public class MisapplicationContainer extends AbstractGroupedContainer { } super.showAnnotations(); } - + /** {@inheritDoc} */ @Override -- 2.34.1