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 a10dae1cf80e3f4c28859d0f215dfb573cc148fc..a19cb6972d1eab3753ff34051a66170b3067a55e 100644 (file)
--- 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<DefinedTerm> 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 <i>this</i> 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 b2669f2e0000343f0b55d53a0045e67ad293bc4d..24a2d5f50bea147d06ecc619bb0095d830b14176 100644 (file)
--- 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 9f2a1fec595ec90bd711a9457b31f71d4bb4b9ec..8daa5bddfd0ec69caf43f08ca29d3638ddaa9bac 100644 (file)
--- 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<TERM extends DefinedTermBase, REL extends Te
     private static final long serialVersionUID = -704169783744494023L;
 
     @SuppressWarnings("unused")
-    private static final Logger logger = LogManager.getLogger(TermGraphBase.class);
+    private static final Logger logger = LogManager.getLogger();
 
  // ******************** CONSTRUCTOR *************************************/