From: jenkins Date: Mon, 10 Jul 2017 11:57:33 +0000 (+0200) Subject: Merge branch 'hotfix/4.8.1' into develop X-Git-Tag: 4.9.0^2~39^2 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/320e127e2e6179918b51bb800ef49fe5966f9687?hp=a9e516623aaaadb244f06028b6763c345cf168aa Merge branch 'hotfix/4.8.1' into develop --- 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 3be30d737..71d4c0a9a 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 @@ -97,7 +97,7 @@ public class MisapplicationContainer extends AbstractGroupedContainer { if (getMisappliedName().getAppendedPhrase() != null ){ sec = getMisappliedName().getAppendedPhrase() + " "+sec; //$NON-NLS-1$ } - title += sec + misapplication.getCitation().getTitleCache(); + title += sec + getMisappliedName().getSec().getTitleCache(); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java index f83a8d312..de07e5e74 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java @@ -119,7 +119,7 @@ public class GrantedAuthorityDetailSection extends */ @Override public GrantedAuthority addExisting() { - System.err.println("Test"); + return null; }