Merge branch 'develop' into feature/cdm-4.7

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / description / Feature.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java
index 10ae6e06290c97b563f09d8b22adb85176b9206e..77d6a88b5ec4599864df96f307f33ac3cc9183fb 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java
@@ -195,20 +195,6 @@ public class Feature extends DefinedTermBase<Feature> {
 
 /* ***************** CONSTRUCTOR AND FACTORY METHODS **********************************/
 
-       /**
-        * Class constructor: creates a new feature instance with a description (in the {@link Language#DEFAULT() default language}),
-        * a label and a label abbreviation.
-        *
-        * @param       term             the string (in the default language) describing the
-        *                                               new feature to be created
-        * @param       label            the string identifying the new feature to be created
-        * @param       labelAbbrev  the string identifying (in abbreviated form) the
-        *                                               new feature to be created
-        * @see                                  #Feature()
-        */
-       protected Feature(String description, String label, String labelAbbrev) {
-               super(TermType.Feature, description, label, labelAbbrev);
-       }
 
        /**
         * Creates a new empty feature instance.
@@ -223,15 +209,15 @@ public class Feature extends DefinedTermBase<Feature> {
         * Creates a new feature instance with a description (in the {@link Language#DEFAULT() default language}),
         * a label and a label abbreviation.
         *
-        * @param       term             the string (in the default language) describing the
+        * @param       description      the string (in the default language) describing the
         *                                               new feature to be created
         * @param       label            the string identifying the new feature to be created
-        * @param       labelAbbrev  the string identifying (in abbreviated form) the
+        * @param       labelAbbrev      the string identifying (in abbreviated form) the
         *                                               new feature to be created
         * @see                                  #readCsvLine(List, Language)
         * @see                                  #NewInstance()
         */
-       public static Feature NewInstance(String term, String label, String labelAbbrev){
+       public static Feature NewInstance(String description, String label, String labelAbbrev){
                return new Feature(term, label, labelAbbrev);
        }
 
@@ -242,6 +228,21 @@ public class Feature extends DefinedTermBase<Feature> {
         super(TermType.Feature);
     }
 
+    /**
+     * Class constructor: creates a new feature instance with a description (in the {@link Language#DEFAULT() default language}),
+     * a label and a label abbreviation.
+     *
+     * @param   term         the string (in the default language) describing the
+     *                       new feature to be created
+     * @param   label        the string identifying the new feature to be created
+     * @param   labelAbbrev  the string identifying (in abbreviated form) the
+     *                       new feature to be created
+     * @see                  #Feature()
+     */
+    protected Feature(String term, String label, String labelAbbrev) {
+        super(TermType.Feature, term, label, labelAbbrev);
+    }
+
 /* *************************************************************************************/
 
        @Override