From: Andreas Müller Date: Thu, 8 Dec 2022 12:43:33 +0000 (+0100) Subject: cleanup X-Git-Tag: 5.35.0^2~120 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/574e585a1c42a8d0ae12afd0cec65ddae506d086 cleanup --- diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java index a10dae1cf8..a19cb6972d 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java @@ -6,10 +6,8 @@ * 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.model.description; - import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -103,7 +101,7 @@ public class StateData @XmlElementWrapper(name = "Modifiers") @XmlElement(name = "Modifier") @ManyToMany(fetch = FetchType.LAZY) -// @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE}) remove cascade #5755 + //no cascade #5755 @IndexedEmbedded(depth=1) // @NotNull // avoids creating a UNIQUE key for this field -> not needed for ManyToMany private Set modifiers = new HashSet<>(); @@ -247,26 +245,6 @@ public class StateData return this.modifyingText; } - /** - * Creates a {@link LanguageString language string} based on the given text string - * and the given {@link Language language} and adds it to the {@link MultilanguageText multilanguage text} - * used to qualify the validity of this state data. - * - * - * @param text the string describing the validity - * in a particular language - * @param language the language in which the text string is formulated - * - * @see #getModifyingText() - * @see #putModifyingText(LanguageString) - * @deprecated should follow the put semantic of maps, this method will be removed in v4.0 - * Use the {@link #putModifyingText(Language, String) putModifyingText} method instead - */ - @Deprecated - public LanguageString addModifyingText(String text, Language language){ - return this.putModifyingText(language, text); - } - /** * Creates a {@link LanguageString language string} based on the given text string * and the given {@link Language language} and adds it to the {@link MultilanguageText multilanguage text} diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermBase.java index b2669f2e00..24a2d5f50b 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermBase.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermBase.java @@ -98,7 +98,6 @@ public abstract class TermBase TermBase(){} protected TermBase(TermType type){ - super(); if (type == null){ throw new IllegalArgumentException("TermType must not be null"); }else{ @@ -106,8 +105,6 @@ public abstract class TermBase } } - - protected TermBase(TermType type, String term, String label, String labelAbbrev, Language lang) { this(type); if (lang == null) { @@ -159,8 +156,6 @@ public abstract class TermBase /** * @see #getPreferredRepresentation(Language) - * @param language - * @return */ public Representation getPreferredRepresentation(Language language) { Representation repr = getRepresentation(language); diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermGraphBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermGraphBase.java index 9f2a1fec59..8daa5bddfd 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermGraphBase.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermGraphBase.java @@ -35,7 +35,7 @@ public abstract class TermGraphBase