cleaup and remove deprecated methods from TermTree

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 8daa5bddfd0ec69caf43f08ca29d3638ddaa9bac..3902d755bbe346df4ef9441b4974493695d1652c 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
@@ -33,7 +33,6 @@ public abstract class TermGraphBase<TERM extends DefinedTermBase, REL extends Te
             implements ITermGraph<TERM, REL>{
 
     private static final long serialVersionUID = -704169783744494023L;
-
     @SuppressWarnings("unused")
     private static final Logger logger = LogManager.getLogger();
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermTree.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermTree.java
index da8549557ded89cb890fb64096a365f348ba52b4..1d463330646504f3a1239d407a17840be62ef84c 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermTree.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermTree.java
@@ -105,30 +105,11 @@ public class TermTree <T extends DefinedTermBase>
         return new TermTree<>(termType);
     }
 
-    /**
-        * Creates a new feature tree instance with an empty {@link #getRoot() root node}.
-        *
-        * @see #NewInstance(UUID)
-        * @see #NewInstance(List)
-        * @deprecated since 5.9. Use {@link #NewFeatureInstance()} instead
-        */
-       @Deprecated
-    public static TermTree<Feature> NewInstance(){
-               return NewFeatureInstance();
-       }
-
     public static TermTree<Feature> NewFeatureInstance(){
         return new TermTree<>(TermType.Feature);
     }
 
        /**
-        * @deprecated since 5.9, use {@link #NewFeatureInstance(UUID)} instead
-        */
-       @Deprecated
-    public static TermTree<? extends Feature> NewInstance(UUID uuid){
-               return NewFeatureInstance(uuid);
-       }
-       /**
      * Creates a new feature tree instance with an empty {@link #getRoot() root node}
      * and assigns to the new feature tree the given
      * UUID (universally unique identifier).
@@ -143,13 +124,6 @@ public class TermTree <T extends DefinedTermBase>
         return result;
     }
 
-    /**
-     * @deprecated sinde 5.9 use {@link #NewFeatureInstance(List)} instead
-     */
-    @Deprecated
-    public static TermTree<Feature> NewInstance(List<Feature> featureList){
-        return NewFeatureInstance(featureList);
-    }
        /**
         * Creates a new feature tree instance with a {@link #getRoot() root node}
         * the children of which are the feature nodes build on the base of the
@@ -221,8 +195,6 @@ public class TermTree <T extends DefinedTermBase>
                return result;
        }
 
-
-
 //******************** METHODS ***********************************************/
 
        /**
@@ -247,7 +219,6 @@ public class TermTree <T extends DefinedTermBase>
         return result;
     }
 
-
     public Set<T> independentTerms() {
         Set<T> terms = root.getIndependentTermsRecursive();
         return terms;
@@ -278,5 +249,4 @@ public class TermTree <T extends DefinedTermBase>
                        throw new RuntimeException(message);
                }
        }
-
-}
+}
\ No newline at end of file