From: Andreas Müller Date: Fri, 29 Jul 2022 20:35:03 +0000 (+0200) Subject: cleanup X-Git-Tag: 5.32.0^2~17 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/0419bfc2491affab84f490c0a49fd48e96537478 cleanup --- diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java index c3d2a2d3cf..d4671949f5 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java @@ -51,6 +51,7 @@ public class TaxonRelationshipFormatter { private static final String AUCT = "auct."; private static final String SENSU_SEPARATOR = " sensu "; private static final String SEC_SEPARATOR = " sec. "; + private static final String PRO_PARTE_SEPARATOR = ", "; private static final String DETAIL_SEPARATOR = ": "; private static final String INVERT_SYMBOL = "<-"; //TODO private static final String UNDEFINED_SYMBOL = "??"; //TODO @@ -166,11 +167,11 @@ public class TaxonRelationshipFormatter { //p.p. if (isMisapplied) { if (isProParteMAN(type, inverse)) { - builder.addSeparator(", "); + builder.addSeparator(PRO_PARTE_SEPARATOR); symbol = "p.p."; builder.add(TagEnum.symbol, symbol); } else if (isPartialMAN(type, inverse)) { - builder.addSeparator(", "); + builder.addSeparator(PRO_PARTE_SEPARATOR); symbol = "part."; builder.add(TagEnum.symbol, symbol); } diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/TagEnum.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/TagEnum.java index 356b73c3b0..c6a2c46d66 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/TagEnum.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/TagEnum.java @@ -92,7 +92,7 @@ public enum TagEnum { * a separator for name in source of secundum reference(for TaxonBase) */ secNameInSourceSeparator, - + // /** // * a secundum reference as used in a misapplied name (for TaxonRelationship) // */ diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatterTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatterTest.java index a30f1675f3..f4439fab11 100644 --- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatterTest.java +++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatterTest.java @@ -171,8 +171,6 @@ public class TaxonRelationshipFormatterTest extends TermTestBase{ str = TaggedCacheHelper.createString(tags); //#10082 Assert.assertEquals("We split the inverse symbol here", manInverseSymbol + " \"Abies alba\" sensu Macfarlane 1918, part., err. sec. Cheek 1919: 123", str); - - } @Test