Removal of untyped expression

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/WorkingSet.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/WorkingSet.java
index 0bac724a2be7327ae5b403a597c1c174c5429d4f..d48497d42654bf2cbc423b46bc96cdf409b0642a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/WorkingSet.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/WorkingSet.java
@@ -62,7 +62,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 @Entity\r
 @Audited\r
 \r
-public class WorkingSet<S extends DescriptionBase> extends AnnotatableEntity {\r
+public class WorkingSet extends AnnotatableEntity {\r
        private static final long serialVersionUID = 3256448866757415686L;\r
        @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(WorkingSet.class);\r
@@ -86,7 +86,7 @@ public class WorkingSet<S extends DescriptionBase> extends AnnotatableEntity {
     @XmlSchemaType(name = "IDREF")\r
     @ManyToMany(fetch = FetchType.LAZY)\r
        @Cascade(CascadeType.SAVE_UPDATE)\r
-       private Set<S> descriptions = new HashSet<S>();\r
+       private Set<DescriptionBase> descriptions = new HashSet<DescriptionBase>();\r
        \r
        /** \r
         * Class constructor: creates a new empty working set instance.\r
@@ -222,10 +222,10 @@ public class WorkingSet<S extends DescriptionBase> extends AnnotatableEntity {
         * Returns the {@link DescriptionBase descriptions} of\r
         * <i>this</i> working set.\r
         * \r
-        * @see    #addDescription(S)\r
-        * @see    #removeDescription(S)\r
+        * @see    #addDescription(DescriptionBase)\r
+        * @see    #removeDescription(DescriptionBase)\r
         */\r
-       public Set<S> getDescriptions() {\r
+       public Set<DescriptionBase> getDescriptions() {\r
                return descriptions;\r
        }\r
        \r
@@ -236,9 +236,9 @@ public class WorkingSet<S extends DescriptionBase> extends AnnotatableEntity {
         * \r
         * @param description   the description to be added to <i>this</i> working set\r
         * @see                                                                         #getDescriptions()\r
-        * @see                                                                         WorkingSet#addDescription(S)\r
+        * @see                                                                         WorkingSet#addDescription(DescriptionBase)\r
         */\r
-       public void addDescription(S description) {\r
+       public void addDescription(DescriptionBase description) {\r
                logger.debug("addDescription");\r
                this.descriptions.add(description);\r
        }\r
@@ -249,10 +249,10 @@ public class WorkingSet<S extends DescriptionBase> extends AnnotatableEntity {
         *\r
         * @param  description   the description which should be removed\r
         * @see                                                                 #getDescriptions()\r
-        * @see                                                                 #addDescription(S)\r
-        * @see                                                                 WorkingSet#removeDescription(S)\r
+        * @see                                                                 #addDescription(DescriptionBase)\r
+        * @see                                                                 WorkingSet#removeDescription(DescriptionBase)\r
         */\r
-       public void removeDescription(S description) {\r
+       public void removeDescription(DescriptionBase description) {\r
                this.descriptions.remove(description);\r
        }\r
        \r