From 2517f1896cea2bc412203cc8b2d6f1b5211b068b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 10 Nov 2022 14:57:29 +0100 Subject: [PATCH] cleanup --- .../cdm/io/berlinModel/in/BerlinModelImportBase.java | 11 +---------- .../in/BerlinModelTaxonRelationImport.java | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportBase.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportBase.java index bc013169..eadc3d27 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportBase.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportBase.java @@ -140,7 +140,7 @@ public abstract class BerlinModelImportBase annotatableEntity.addAnnotation(annotation); }else if (config.getEditor().equals(EDITOR.EDITOR_AS_EDITOR)){ User creator; - boolean xmlSourceAdded= addXmlSource(state, rs, annotatableEntity, createdWho, false); + boolean xmlSourceAdded = addXmlSource(state, rs, annotatableEntity, createdWho, false); if (xmlSourceAdded){ creator = getXmlImporter(state); }else{ @@ -182,15 +182,6 @@ public abstract class BerlinModelImportBase return getUser(state, "import to BM"); } - - /** - * @param state - * @param rs - * @param annotatableEntity - * @param xmlSourceAdded - * @return - * @throws SQLException - */ private boolean addXmlSource(BerlinModelImportState state, ResultSet rs, AnnotatableEntity annotatableEntity, String username, boolean existsAlready) throws SQLException { if (!state.getConfig().isEuroMed()){ return false; diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java index 70465095..342742ac 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java @@ -189,7 +189,7 @@ public class BerlinModelTaxonRelationImport extends BerlinModelImportBase { if (includeAllClassifications){ - //add otherdirection + //add other direction strQuerySelect = "SELECT PTaxon.PTRefFk, r.RefCache "; strQueryFrom = " FROM RelPTaxon rel " + " INNER JOIN PTaxon AS PTaxon ON rel.PTNameFk1 = PTaxon.PTNameFk AND rel.PTRefFk1 = PTaxon.PTRefFk " + -- 2.34.1