From 48ad1dcd069f0bf96f319180172a114dd16994fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 18 Mar 2021 00:37:06 +0100 Subject: [PATCH] cleanup --- .../cdm/app/cyprus/CyprusImagesActivator.java | 2 +- .../cdm/app/salvador/TestSalvadorAreaMapping.java | 11 +++-------- .../berlinModel/out/BerlinModelTaxonNameExport.java | 2 +- .../cdm/io/mexico/MexicoBorhidiExcelImport.java | 2 +- .../eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java | 4 ++-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusImagesActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusImagesActivator.java index 5bf54199..aaeb95b3 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusImagesActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusImagesActivator.java @@ -12,7 +12,6 @@ package eu.etaxonomy.cdm.app.cyprus; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; -import eu.etaxonomy.cdm.common.URI; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.HashMap; @@ -38,6 +37,7 @@ import org.springframework.transaction.TransactionStatus; import eu.etaxonomy.cdm.api.application.CdmApplicationController; import eu.etaxonomy.cdm.api.service.config.MatchingTaxonConfigurator; import eu.etaxonomy.cdm.app.common.CdmDestinations; +import eu.etaxonomy.cdm.common.URI; import eu.etaxonomy.cdm.common.UTF8; import eu.etaxonomy.cdm.common.media.CdmImageInfo; import eu.etaxonomy.cdm.database.DbSchemaValidation; diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/salvador/TestSalvadorAreaMapping.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/salvador/TestSalvadorAreaMapping.java index e56aba4b..2d9cc9e5 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/salvador/TestSalvadorAreaMapping.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/salvador/TestSalvadorAreaMapping.java @@ -27,7 +27,6 @@ import eu.etaxonomy.cdm.io.api.application.CdmIoApplicationController; /** * @author a.mueller * @since 08.07.2017 - * */ public class TestSalvadorAreaMapping { @SuppressWarnings("unused") @@ -40,7 +39,6 @@ public class TestSalvadorAreaMapping { // static final ICdmDataSource cdmDestination = CdmDestinations.cdm_salvador_preview(); static final ICdmDataSource cdmDestination = CdmDestinations.cdm_production_salvador(); - protected void doTest(ICdmDataSource cdmDestination){ CdmIoApplicationController app = CdmIoApplicationController.NewInstance(cdmDestination, hbm2dll); @@ -51,11 +49,6 @@ public class TestSalvadorAreaMapping { } } - - /** - * @param app - * @throws Exception - */ private void doTest2(CdmIoApplicationController app) { UUID taxonUuid = UUID.fromString("eae896f0-3194-4b7b-a502-ad1d54ec36e6"); // Taxon taxon = (Taxon)app.getTaxonService().find(taxonUuid); @@ -69,7 +62,9 @@ public class TestSalvadorAreaMapping { partSet.add(InfoPart.mapUriParams); EnumSet parts = EnumSet.copyOf(partSet); - geoService.composeDistributionInfoFor(parts, taxonUuid, false, false, null, null, null, null, null, null, null); + geoService.composeDistributionInfoFor(parts, taxonUuid, false, false, null, true, + null, null, + null, null, null, null, false); } catch (Exception e) { e.printStackTrace(); } diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelTaxonNameExport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelTaxonNameExport.java index 493caa1e..49d88e90 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelTaxonNameExport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelTaxonNameExport.java @@ -147,7 +147,7 @@ public class BerlinModelTaxonNameExport extends BerlinModelExportBase String tableName = "NomStatusRel"; String collectionAttribute = "status"; IdMapper parentMapper = IdMapper.NewInstance("NameFk"); - CollectionExportMapping mapping = CollectionExportMapping.NewInstance(tableName, collectionAttribute, parentMapper); + CollectionExportMapping mapping = CollectionExportMapping.NewInstance(tableName, collectionAttribute, parentMapper); mapping.addMapper(MethodMapper.NewInstance("NomStatusFk", this.getClass(), "getNomStatusFk", NomenclaturalStatus.class)); mapping.addMapper(DbObjectMapper.NewInstance("citation", "NomStatusRefFk")); mapping.addMapper(RefDetailMapper.NewInstance("citationMicroReference","citation", "NomStatusRefDetailFk")); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java index c41ec804..8002af2b 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java @@ -8,7 +8,6 @@ */ package eu.etaxonomy.cdm.io.mexico; -import eu.etaxonomy.cdm.common.URI; import java.net.URISyntaxException; import java.util.Arrays; import java.util.List; @@ -20,6 +19,7 @@ import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import eu.etaxonomy.cdm.common.CdmUtils; +import eu.etaxonomy.cdm.common.URI; import eu.etaxonomy.cdm.common.UTF8; import eu.etaxonomy.cdm.model.common.Extension; import eu.etaxonomy.cdm.model.common.ExtensionType; diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java index 0b6d23d5..93a0e74a 100644 --- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java +++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java @@ -2074,8 +2074,8 @@ public class PesiTaxonExport extends PesiExportBase { String author = sec == null? "" : sec.getTitleCache(); String webShowName = isMisapplied? getDisplayName(taxon):getWebShowName(taxonName); //for misapplied we need also the sensu and non author part, for ordinary names name + author is enough String accessed = ". Accessed through: Euro+Med PlantBase at https://www.europlusmed.org/cdm_dataportal/taxon/"; - result = CdmUtils.removeTrailingDot(author) - + ". " + CdmUtils.removeTrailingDot(webShowName) + result = CdmUtils.removeTrailingDots(author) + + ". " + CdmUtils.removeTrailingDots(webShowName) + accessed + taxon.getUuid(); } else { //TODO check for IF + FE -- 2.34.1