From 26f4659212c6f4986d0a896fb85c7d804f1f2a57 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 30 Mar 2021 20:58:47 +0200 Subject: [PATCH] cleanup --- .../etaxonomy/cdm/strategy/cache/TaggedText.java | 2 ++ .../service/name/TypeDesignationSetFormatter.java | 15 ++++++--------- .../{ => name}/TypeDesignationSetManagerTest.java | 6 ++---- 3 files changed, 10 insertions(+), 13 deletions(-) rename cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/{ => name}/TypeDesignationSetManagerTest.java (98%) diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/TaggedText.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/TaggedText.java index a2fbc15743..f27bc683f2 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/TaggedText.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/TaggedText.java @@ -109,4 +109,6 @@ public class TaggedText implements Serializable{ } } + + } \ No newline at end of file diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatter.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatter.java index 1e99d0dbf5..c47bed5c89 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatter.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatter.java @@ -147,9 +147,10 @@ public class TypeDesignationSetFormatter { } - private int buildTaggedTextForSingleTypeStatus(TypeDesignationSetManager manager, TaggedTextBuilder workingsetBuilder, - TypeDesignationWorkingSet typeDesignationWorkingSet, int typeStatusCount, - TypeDesignationStatusBase typeStatus, int typeSetCount) { + private int buildTaggedTextForSingleTypeStatus(TypeDesignationSetManager manager, + TaggedTextBuilder workingsetBuilder, TypeDesignationWorkingSet typeDesignationWorkingSet, + int typeStatusCount, TypeDesignationStatusBase typeStatus, int typeSetCount) { + //starting separator if(typeStatusCount++ > 0){ workingsetBuilder.add(TagEnum.separator, TYPE_STATUS_SEPARATOR); @@ -173,17 +174,13 @@ public class TypeDesignationSetFormatter { TypeDesignationBase typeDes = manager.findTypeDesignation(typeDesignationDTO.getUuid()); typeDesignationCount = buildTaggedTextForSingleType(typeDes, withCitation, - workingsetBuilder, typeDesignationCount -// , typeDesignationEntityReference - ); + workingsetBuilder, typeDesignationCount); } return typeStatusCount; } protected static int buildTaggedTextForSingleType(TypeDesignationBase typeDes, boolean withCitation, - TaggedTextBuilder workingsetBuilder, int typeDesignationCount -// , TypedEntityReference typeDesignationEntityReference - ) { + TaggedTextBuilder workingsetBuilder, int typeDesignationCount) { if(typeDesignationCount++ > 0){ workingsetBuilder.add(TagEnum.separator, TYPE_DESIGNATION_SEPARATOR); diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TypeDesignationSetManagerTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManagerTest.java similarity index 98% rename from cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TypeDesignationSetManagerTest.java rename to cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManagerTest.java index cfc275c6e5..a56e6ea3a1 100755 --- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TypeDesignationSetManagerTest.java +++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManagerTest.java @@ -6,7 +6,7 @@ * 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. */ -package eu.etaxonomy.cdm.api.service; +package eu.etaxonomy.cdm.api.service.name; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -20,8 +20,6 @@ import org.junit.Before; import org.junit.Test; import eu.etaxonomy.cdm.api.service.exception.RegistrationValidationException; -import eu.etaxonomy.cdm.api.service.name.TypeDesignationSetManager; -import eu.etaxonomy.cdm.api.service.name.TypeDesignationWorkingSet; import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.cdm.model.agent.Team; import eu.etaxonomy.cdm.model.common.IdentifiableSource; @@ -53,7 +51,7 @@ import eu.etaxonomy.cdm.test.TermTestBase; * @author a.kohlbecker, k.luther * @since 03.09.2018 */ -public class TypeDesignationSetManagerTest extends TermTestBase{ +public class TypeDesignationSetManagerTest extends TermTestBase{ private NameTypeDesignation ntd; private NameTypeDesignation ntd_LT; -- 2.34.1