From b20f0d739a7ef13937572c9dba435f78e18c0b78 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Sat, 15 Jan 2022 16:03:27 +0100 Subject: [PATCH] cleanup --- .../api/service/DeltaTextDataProcessor.java | 25 +++++++++++++------ .../api/service/NaturalLanguageGenerator.java | 5 ++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DeltaTextDataProcessor.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DeltaTextDataProcessor.java index bfee169be7..a0b4de04c0 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DeltaTextDataProcessor.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DeltaTextDataProcessor.java @@ -1,3 +1,11 @@ +/** +* Copyright (C) 2007 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* 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; import java.util.Map; @@ -8,24 +16,28 @@ import eu.etaxonomy.cdm.model.common.Language; import eu.etaxonomy.cdm.model.common.LanguageString; import eu.etaxonomy.cdm.model.description.TextData; +/** + * @author m.venin + * @since 2010-12-02 + */ public class DeltaTextDataProcessor implements INaturalLanguageTextDataProcessor { @Override public void process(TextData textData, TextData previousTextData) { boolean doItBetter = false; - + Map previousMultiLanguageText = previousTextData.getMultilanguageText(); Map multiLanguageText = textData.getMultilanguageText(); - + for (Language language : multiLanguageText.keySet()){ LanguageString langString = multiLanguageText.get(language); String text = langString.getText(); - + LanguageString tmpMultilangText = previousMultiLanguageText.get(language); if( tmpMultilangText != null){ text = StringUtils.remove(text, tmpMultilangText.getText()); } - + if (doItBetter) { //TODO remove the text between brackets StringBuilder strbuilder = new StringBuilder(); do { @@ -37,12 +49,9 @@ public class DeltaTextDataProcessor implements INaturalLanguageTextDataProcessor else{ text=StringUtils.replaceChars(text,"<>",""); } - + textData.removeText(language); textData.putText(language, text); - } - } - } diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGenerator.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGenerator.java index 499b287e74..3e386e54ef 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGenerator.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGenerator.java @@ -36,19 +36,20 @@ import eu.etaxonomy.cdm.model.term.TermNode; */ @Component public class NaturalLanguageGenerator implements INaturalLanguageGenerator { + @SuppressWarnings("unused") private static final Logger logger = Logger.getLogger(NaturalLanguageGenerator.class); private String firstSeparator = ","; private String secondSeparator = "."; - private List levels = new ArrayList(); + private List levels = new ArrayList<>(); private DescriptionBuilder quantitativeDescriptionBuilder = new DefaultQuantitativeDescriptionBuilder(); private DescriptionBuilder categoricalDescriptionBuilder = new DefaultCategoricalDescriptionBuilder(); private TextData previousTextData; - DeltaTextDataProcessor deltaTextDataProcessor = new DeltaTextDataProcessor(); + private DeltaTextDataProcessor deltaTextDataProcessor = new DeltaTextDataProcessor(); private Map elementProcessors; -- 2.34.1