Delete warnings in description

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/AbsenceTerm.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/AbsenceTerm.java
index eab374391dcac05cb6dd175b62965e8d94eafe58..fea557de162283ce55d567600a70341a675255da 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/AbsenceTerm.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/AbsenceTerm.java
@@ -37,6 +37,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "AbsenceTerm")
 @Entity
 public class AbsenceTerm extends PresenceAbsenceTermBase<AbsenceTerm> {
+       private static final long serialVersionUID = -7145360212307512860L;
        private static final Logger logger = Logger.getLogger(AbsenceTerm.class);
        
        /** 
@@ -45,6 +46,7 @@ public class AbsenceTerm extends PresenceAbsenceTermBase<AbsenceTerm> {
         * @see #NewInstance(String, String, String)
         */
        public static AbsenceTerm NewInstance(){
+               logger.debug("NewInstance");
                return new AbsenceTerm();
        }
        

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java
index aa676bb16938628fadecacd214927f7358763ebb..0e7cb64e9698c639ce6255f031b61a8721f8c385 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java
@@ -9,15 +9,11 @@
 
 package eu.etaxonomy.cdm.model.description;
 
-import org.apache.log4j.Logger;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
+import java.util.ArrayList;
+import java.util.List;
 
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.LanguageString;
-
-import java.util.*;
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -27,6 +23,10 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.log4j.Logger;
+import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
+
 /**
  * This class represents information pieces expressed in categorical type of
  * data (in opposition to {@link QuantitativeData quantitative data} on one side and to literal data on
@@ -56,8 +56,8 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "CategoricalData")
 @Entity
 public class CategoricalData extends DescriptionElementBase {
-       
-       static Logger logger = Logger.getLogger(CategoricalData.class);
+       private static final long serialVersionUID = -6298361966947668998L;
+       private static final Logger logger = Logger.getLogger(CategoricalData.class);
 
        //whether the sequence of ordered states is important
        @XmlElement(name = "OrderRelevant")
@@ -67,7 +67,7 @@ public class CategoricalData extends DescriptionElementBase {
        @XmlElement(name = "State")
        @XmlIDREF
        @XmlSchemaType(name = "IDREF")
-       private List<StateData> states = new ArrayList();
+       private List<StateData> states = new ArrayList<StateData>();
 
        
        /** 
@@ -81,6 +81,7 @@ public class CategoricalData extends DescriptionElementBase {
         * Creates a new empty categorical data instance.
         */
        public static CategoricalData NewInstance(){
+               logger.debug("NewInstance");
                return new CategoricalData();
        }
        
@@ -96,6 +97,7 @@ public class CategoricalData extends DescriptionElementBase {
        /**
         * @see #getStates() 
         */
+       @SuppressWarnings("unused")
        private void setStates(List<StateData> states){
                this.states = states;
        }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CommonTaxonName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CommonTaxonName.java
index 3bfa54d13a66a17738d82479a3e9ca2d85068dcc..d731142a4405638853fa816c80149da8b965f89a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CommonTaxonName.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CommonTaxonName.java
@@ -24,7 +24,6 @@ import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MultilanguageText;
-import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 
 /**
@@ -48,8 +47,8 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 @XmlRootElement(name = "CommonTaxonName")
 @Entity
 public class CommonTaxonName extends DescriptionElementBase {
-       
-       static Logger logger = Logger.getLogger(CommonTaxonName.class);
+       private static final long serialVersionUID = 2643808051976643339L;
+       private static final Logger logger = Logger.getLogger(CommonTaxonName.class);
        
        @XmlElement(name = "Name")
        private String name;
@@ -76,6 +75,7 @@ public class CommonTaxonName extends DescriptionElementBase {
         * @param language      the language of the name string
         */
        public static CommonTaxonName NewInstance(String name, Language language){
+               logger.debug("NewInstance");
                CommonTaxonName result = new CommonTaxonName();
                result.setName(name);
                result.setLanguage(language);

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java
index 2c0d77b0c982e3b68884b13eb609b9b7fbc03182..de37ed3a2e91500135b8799d924c24b2db136abe 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java
@@ -17,7 +17,6 @@ import javax.persistence.FetchType;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.ManyToMany;
-
 import javax.persistence.OneToMany;
 import javax.persistence.Transient;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -31,18 +30,10 @@ import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
-import eu.etaxonomy.cdm.model.agent.Institution;
-import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.cdm.model.reference.BibtexReference;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
-import eu.etaxonomy.cdm.model.reference.StrictReferenceBase;
-import eu.etaxonomy.cdm.model.taxon.Synonym;
-import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
-import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 
 /**
@@ -69,8 +60,8 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 })
 @Entity
 @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
-public abstract class DescriptionBase extends IdentifiableEntity {
-       
+public abstract class DescriptionBase extends IdentifiableEntity<DescriptionBase> {
+       private static final long serialVersionUID = 5504218413819040193L;
        private static final Logger logger = Logger.getLogger(DescriptionBase.class);
        
        @XmlElementWrapper(name = "DescribedSpecimenOrObservations")
@@ -130,6 +121,7 @@ public abstract class DescriptionBase extends IdentifiableEntity {
         * @see                                                                         SpecimenOrObservationBase#addDescription(DescriptionBase)
         */
        public void addDescribedSpecimenOrObservations(SpecimenOrObservationBase describedSpecimenOrObservation) {
+               logger.debug("addDescribedSpecimenOrObservations");
                this.describedSpecimenOrObservations.add(describedSpecimenOrObservation);
        }
        

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
index 1815df6b7fd98541d3cb8f7ab9268dfd1b8fcf48..afb31d309f748a26b0c6f3891c1545a1c8b9204b 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java
@@ -67,6 +67,8 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 @Entity
 @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
 public abstract class DescriptionElementBase extends ReferencedEntityBase implements IMediaEntity{
+       private static final long serialVersionUID = 5000910777835755905L;
+       @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(DescriptionElementBase.class);
        
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java
index c3eaf8af4609447392bcf8861c7f08222d6fac2c..a6b6c63b2a644e2e8f3be90c48301bcd19e227be 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java
@@ -9,28 +9,8 @@
 
 package eu.etaxonomy.cdm.model.description;
 
-import java.awt.Color;
-import java.awt.color.ColorSpace;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
-
-import org.apache.log4j.Logger;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -39,6 +19,13 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.log4j.Logger;
+import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
+
+import eu.etaxonomy.cdm.model.location.NamedArea;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
+
 /**
  * This class represents elementary distribution data for a {@link Taxon taxon}.
  * Only {@link TaxonDescription taxon descriptions} may contain distributions.
@@ -63,7 +50,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "Distribution")
 @Entity
 public class Distribution extends DescriptionElementBase {
-       static Logger logger = Logger.getLogger(Distribution.class);
+       private static final long serialVersionUID = 8366462435651559730L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(Distribution.class);
        
        @XmlElement(name = "NamedArea")
        @XmlIDREF

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 7d62e54acf7d5c86ce9bf10a101d768a6b3aec90..43efcee101e6b7c4a1f79105660f9811a3c7b7f2 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
@@ -19,7 +19,6 @@ import javax.persistence.Entity;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
-import javax.persistence.Transient;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -30,21 +29,14 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.log4j.Logger;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
 
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.ILoadableTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.name.BotanicalName;
-import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.HybridRelationshipType;
-import eu.etaxonomy.cdm.model.name.NameRelationship;
-import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.Specimen;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
@@ -92,8 +84,9 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 })
 @XmlRootElement(name = "Feature")
 @Entity
-public class Feature extends DefinedTermBase {
-       static Logger logger = Logger.getLogger(Feature.class);
+public class Feature extends DefinedTermBase<Feature> {
+       private static final long serialVersionUID = 6754598791831848704L;
+       private static final Logger logger = Logger.getLogger(Feature.class);
 
        @XmlElement(name = "SupportsTextData")
        private boolean supportsTextData;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureNode.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureNode.java
index 7c5e218b888e08c246fd0915df45c6717c0ad127..e340130713f698742941394fbf746b65d92f6231 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureNode.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureNode.java
@@ -45,6 +45,7 @@ import eu.etaxonomy.cdm.model.common.VersionableEntity;
  * @version 1.0
  * @created 08-Nov-2007 13:06:16
  */
+@SuppressWarnings("serial")
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "FeatureNode", propOrder = {
        "feature",
@@ -54,8 +55,9 @@ import eu.etaxonomy.cdm.model.common.VersionableEntity;
 })
 @XmlRootElement(name = "FeatureNode")
 @Entity
-public class FeatureNode extends VersionableEntity {
-       static Logger logger = Logger.getLogger(FeatureNode.class);
+public class FeatureNode extends VersionableEntity<FeatureNode> {
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(FeatureNode.class);
        
     @XmlElement(name = "Feature")
     @XmlIDREF

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureTree.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureTree.java
index 7025f5af9af7229718cc4ddf6bb886f32bfa5b44..851ce9d75f83bfe00f769b52acebf4f9072048fd 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureTree.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureTree.java
@@ -59,7 +59,13 @@ import eu.etaxonomy.cdm.model.common.TermBase;
 @XmlRootElement(name = "FeatureTree")
 @Entity
 public class FeatureTree extends TermBase {
-       static Logger logger = Logger.getLogger(FeatureTree.class);
+       /**
+        * 
+        */
+       private static final long serialVersionUID = -6713834139003172735L;
+
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(FeatureTree.class);
        //private Set<FeatureNode> nodes = new HashSet<FeatureNode>();
        
        @XmlElement(name = "Root")

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IdentificationKey.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IdentificationKey.java
index 76015c1bac5649237da925dcbd273c8cdb0efae7..6b4ec53c61ff42448739a2a8a4d77a66f07c939a 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IdentificationKey.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IdentificationKey.java
@@ -43,14 +43,15 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "IdentificationKey")
 @Entity
 public class IdentificationKey extends Media {
-       
-       static Logger logger = Logger.getLogger(IdentificationKey.class);
+       private static final long serialVersionUID = -29095811051894471L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(IdentificationKey.class);
        
        @XmlElementWrapper(name = "CoveredTaxa")
        @XmlElement(name = "CoveredTaxon")
        @XmlIDREF
        @XmlSchemaType(name = "IDREF")
-       private Set<Taxon> coveredTaxa = new HashSet();
+       private Set<Taxon> coveredTaxa = new HashSet<Taxon>();
        
        /** 
         * Class constructor: creates a new empty identification key instance.

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java
index f077a68686e1b3773c9853f7d2b1924e20e58da0..d899c886c02deef117e85a385589796a61d5bf07 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java
@@ -10,14 +10,8 @@
 package eu.etaxonomy.cdm.model.description;
 
 
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.LanguageString;
-import eu.etaxonomy.cdm.model.common.MultilanguageText;
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
-
-import org.apache.log4j.Logger;
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -26,6 +20,13 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.log4j.Logger;
+
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.LanguageString;
+import eu.etaxonomy.cdm.model.common.MultilanguageText;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+
 /**
  * This class represents associations between the described
  * {@link SpecimenOrObservationBase specimen or observation}
@@ -48,8 +49,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "IndividualsAssociation")
 @Entity
 public class IndividualsAssociation extends DescriptionElementBase {
-       
-       static Logger logger = Logger.getLogger(IndividualsAssociation.class);
+       private static final long serialVersionUID = -4117554860254531809L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(IndividualsAssociation.class);
        
        @XmlElement(name = "Description")
        private MultilanguageText description;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java
index d17cb02adac7baa1a54857acd51d3c709275954e..007a6e0ab08a66ef9fc64102b2986249c7a7d728 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java
@@ -32,8 +32,10 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "MeasurementUnit")
 @XmlRootElement(name = "MeasurementUnit")
 @Entity
-public class MeasurementUnit extends DefinedTermBase {
-       static Logger logger = Logger.getLogger(MeasurementUnit.class);
+public class MeasurementUnit extends DefinedTermBase<MeasurementUnit> {
+       private static final long serialVersionUID = 4904519152652248312L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(MeasurementUnit.class);
        
        /** 
         * Class constructor: creates a new empty measurement unit instance.

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Modifier.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Modifier.java
index 28baf8930aee1f3ead4e4df3d429a1e5b66cf321..19eeb13e9a6e1953d1732330614928c7c4338c37 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Modifier.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Modifier.java
@@ -40,7 +40,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "Modifier")
 @Entity
 public class Modifier extends OrderedTermBase<Modifier> {
-       static Logger logger = Logger.getLogger(Modifier.class);
+       private static final long serialVersionUID = -2491833848163461951L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(Modifier.class);
        
        /** 
         * Class constructor: creates a new empty modifier instance.

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermBase.java
index 8836623783fb840a4dff3ce0f6621dfb80ced206..8f42263f7663ec32f239dfcc6335e08b0e932aa5 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermBase.java
@@ -14,22 +14,22 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import javax.persistence.Entity;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.log4j.Logger;
+
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.ILoadableTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 
-import org.apache.log4j.Logger;
-import javax.persistence.*;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
 /**
  * This (abstract) class represents terms describing the {@link AbsenceTerm absence}
  * (like "extinct") or the {@link PresenceTerm presence} (like "cultivated") of a {@link Taxon taxon}
@@ -47,6 +47,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "PresenceAbsenceTermBase")
 @Entity
 public abstract class PresenceAbsenceTermBase<T extends PresenceAbsenceTermBase> extends OrderedTermBase<PresenceAbsenceTermBase> {
+       private static final long serialVersionUID = 1596291470042068880L;
        private static final Logger logger = Logger.getLogger(PresenceAbsenceTermBase.class);
 
        private static Map<String, UUID> map = new HashMap<String, UUID>();

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceTerm.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceTerm.java
index d1bea86b2bfc8cbb746dc6c75fe6b00fc5c949f2..e35dc6b167b07c92a2b05711ed9cc021c1364d88 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceTerm.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceTerm.java
@@ -9,26 +9,20 @@
 
 package eu.etaxonomy.cdm.model.description;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.UUID;
 
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.location.Continent;
 import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
-
-import javax.persistence.*;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 
 /**
  * This class represents terms describing different types of presence
@@ -43,6 +37,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "PresenceTerm")
 @Entity
 public class PresenceTerm extends PresenceAbsenceTermBase<PresenceTerm> {
+       private static final long serialVersionUID = -2876981902335193596L;
        private static final Logger logger = Logger.getLogger(PresenceTerm.class);
 
        //********* METHODS **************************************/

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java
index b9c314c69bf40f5357c537cb008c6d68843125d7..2799e2db67db1666156207910e8f0b1485b49303 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/QuantitativeData.java
@@ -9,17 +9,13 @@
 
 package eu.etaxonomy.cdm.model.description;
 
+import java.util.HashSet;
+import java.util.Set;
 
-import org.apache.log4j.Logger;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
-
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.LanguageString;
-
-import java.util.*;
-
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Transient;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -29,6 +25,10 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.log4j.Logger;
+import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
+
 /**
  * This class represents information pieces expressed in numerical data
  * (in opposition to {@link CategoricalData categorical data} on one side and to literal data on
@@ -62,8 +62,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "QuantitativeData")
 @Entity
 public class QuantitativeData extends DescriptionElementBase {
-       
-       static Logger logger = Logger.getLogger(QuantitativeData.class);
+       private static final long serialVersionUID = -2755806455420051488L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(QuantitativeData.class);
        
        @XmlElement(name = "MeasurementUnit")
        @XmlIDREF
@@ -74,7 +75,7 @@ public class QuantitativeData extends DescriptionElementBase {
        @XmlElement(name = "StatisticalValue")
        @XmlIDREF
        @XmlSchemaType(name = "IDREF")
-       private Set<StatisticalMeasurementValue> statisticalValues = new HashSet();
+       private Set<StatisticalMeasurementValue> statisticalValues = new HashSet<StatisticalMeasurementValue>();
        
        /** 
         * Class constructor: creates a new empty quantitative data instance.

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Scope.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Scope.java
index 49c0da465a4f47374620e437b9fdf7ff1a80749d..2be2cef4ea50ed3fa58fed6d865dda33bb8cce07 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Scope.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Scope.java
@@ -10,22 +10,16 @@
 package eu.etaxonomy.cdm.model.description;
 
 
-import org.apache.log4j.Logger;
-
-import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.cdm.model.name.Rank;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
-
-import javax.persistence.*;
+import javax.persistence.Entity;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.log4j.Logger;
+
+import eu.etaxonomy.cdm.model.common.Language;
+
 /**
  * The class representing restrictions for the validity of
  * {@link TaxonDescription taxon descriptions}. This could include not only {@link Stage life stage}
@@ -40,6 +34,8 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "Scope")
 @Entity
 public class Scope extends Modifier {
+       private static final long serialVersionUID = 4479960075363470677L;
+       @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(Scope.class);
        
        // ************* CONSTRUCTORS *************/    

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Sex.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Sex.java
index e8ac4f4b4182239d5506cfc01055fdae5c574756..1268f357283561041c3da45095a4a1227aef2200 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Sex.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Sex.java
@@ -39,6 +39,8 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 @XmlRootElement(name = "Sex")
 @Entity
 public class Sex extends Scope {
+       private static final long serialVersionUID = 3463642992193419657L;
+       @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(Sex.class);
 
        private static final UUID uuidMale = UUID.fromString("600a5212-cc02-431d-8a80-2bf595bd1eab");

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/SpecimenDescription.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/SpecimenDescription.java
index 4a10df61f6941bf9a21d59e1f82f36c8924a5f76..9f069f5b0ab5739a94810bd53936d33f877ac076 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/SpecimenDescription.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/SpecimenDescription.java
@@ -17,7 +17,6 @@ import javax.xml.bind.annotation.XmlType;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 
 /**
@@ -35,7 +34,9 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 @XmlRootElement(name = "SpecimenDescription")
 @Entity
 public class SpecimenDescription extends DescriptionBase {
-       static Logger logger = Logger.getLogger(SpecimenDescription.class);
+       private static final long serialVersionUID = -8506790426682192703L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(SpecimenDescription.class);
        
 
        /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Stage.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Stage.java
index 3a5606a98a8d9d71eefba7c82af29c57caad7d9c..11a23287ce8a19f5ebc0d534263a47b93e1eed82 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Stage.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Stage.java
@@ -36,6 +36,8 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "Stage")
 @Entity
 public class Stage extends Scope {
+       private static final long serialVersionUID = 2338810516765894760L;
+       @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(Stage.class);
 
        // ************* CONSTRUCTORS *************/    

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java
index 2dde9351383aec21fbde9005f2db352c24db6fab..c9678234b9fcecfdaa248228d9bf0354642b4e22 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java
@@ -10,19 +10,17 @@
 package eu.etaxonomy.cdm.model.description;
 
 
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
-
-import org.apache.log4j.Logger;
-
-import javax.persistence.*;
+import javax.persistence.Entity;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.log4j.Logger;
+
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.OrderedTermBase;
+
 /**
  * This class represents terms describing different states (like "oval" or
  * "triangular") for {@link Feature features} that can be described with
@@ -37,7 +35,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "State")
 @Entity
 public class State extends OrderedTermBase<State> {
-       static Logger logger = Logger.getLogger(State.class);
+       private static final long serialVersionUID = -4816292463790262516L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(State.class);
 
        // ************* CONSTRUCTORS *************/    
        /** 

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 d6936be5b2d49c4b93813a5d4f5731cbe012c18a..de5dc856b8739330a36d87115a8d26c364e31a53 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
@@ -50,8 +50,9 @@ import javax.xml.bind.annotation.XmlType;
 })
 @XmlRootElement(name = "StateData")
 @Entity
-public class StateData extends VersionableEntity {
-       
+public class StateData extends VersionableEntity<StateData> {
+       private static final long serialVersionUID = -4380314126624505415L;
+       @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(StateData.class);
        
        @XmlElement(name = "State")
@@ -106,6 +107,7 @@ public class StateData extends VersionableEntity {
        /**
         * @see #getModifiers() 
         */
+       @SuppressWarnings("unused")
        private void setModifiers(Set<Modifier> modifiers) {
                this.modifiers = modifiers;
        }
@@ -149,6 +151,7 @@ public class StateData extends VersionableEntity {
        /**
         * @see #getModifyingText() 
         */
+       @SuppressWarnings("unused")
        private void setModifyingText(MultilanguageText modifyingText) {
                this.modifyingText = modifyingText;
        }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasure.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasure.java
index 256360400b9d986e17871d4e0cd96d1c54592bfd..3755c7de7d15467a994b788811370cd44c023ab6 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasure.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasure.java
@@ -11,17 +11,17 @@ package eu.etaxonomy.cdm.model.description;
 
 import java.util.UUID;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.MarkerType;
-
-import org.apache.log4j.Logger;
-import javax.persistence.*;
+import javax.persistence.Entity;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.log4j.Logger;
+
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+import eu.etaxonomy.cdm.model.common.Language;
+
 /**
 /**
  * This class represents terms describing different statistical measures (such
@@ -36,8 +36,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "StatisticalMeasure")
 @XmlRootElement(name = "StatisticalMeasure")
 @Entity
-public class StatisticalMeasure extends DefinedTermBase {
-       
+public class StatisticalMeasure extends DefinedTermBase<StatisticalMeasure> {
+       private static final long serialVersionUID = 9168097283660941430L;
+       @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(StatisticalMeasure.class);
        
        private static final UUID uuidMin = UUID.fromString("2c8b42e5-154c-42bd-a301-03b483275dd6");

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasurementValue.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasurementValue.java
index 54cf6a7b207b526002170d7cc7a4ceafdf3dfa23..799857f537519538c255461e2df652662ef8632e 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasurementValue.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StatisticalMeasurementValue.java
@@ -10,14 +10,12 @@
 package eu.etaxonomy.cdm.model.description;
 
 
-import eu.etaxonomy.cdm.model.common.VersionableEntity;
-import org.apache.log4j.Logger;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
+import java.util.HashSet;
+import java.util.Set;
 
-import java.util.*;
-
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -27,6 +25,10 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.log4j.Logger;
+
+import eu.etaxonomy.cdm.model.common.VersionableEntity;
+
 /**
  * This class represents the assignment of numerical values to {@link Feature features}
  * corresponding to {@link QuantitativeData quantitative data}. A statistical measurement
@@ -45,9 +47,10 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "StatisticalMeasureValue")
 @XmlRootElement(name = "StatisticalMeasureValue")
 @Entity
-public class StatisticalMeasurementValue extends VersionableEntity {
-       
-       static Logger logger = Logger.getLogger(StatisticalMeasurementValue.class);
+public class StatisticalMeasurementValue extends VersionableEntity<StatisticalMeasurementValue> {
+       private static final long serialVersionUID = -3576311887760351982L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(StatisticalMeasurementValue.class);
        
        @XmlElement(name = "Value")
        private float value;
@@ -56,7 +59,7 @@ public class StatisticalMeasurementValue extends VersionableEntity {
        @XmlElement(name = "Modifier")
        @XmlIDREF
        @XmlSchemaType(name = "IDREF")
-       private Set<Modifier> modifiers = new HashSet();
+       private Set<Modifier> modifiers = new HashSet<Modifier>();
        
        @XmlElement(name = "StatisticalMeasureType")
        @XmlIDREF

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java
index fee26f54584b8bb28feed305f5cc13a4e69e8a3b..507ee4ab2a2dbc336936c53b39d0e5ecefe7a458 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java
@@ -10,17 +10,14 @@
 package eu.etaxonomy.cdm.model.description;
 
 
-import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
-import org.apache.log4j.Logger;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
-
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -29,6 +26,13 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.log4j.Logger;
+import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
+
+import eu.etaxonomy.cdm.model.location.NamedArea;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
+
 /**
  * This class represents descriptions that delimit or circumscribe a real taxon.
  * <P>
@@ -50,8 +54,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "TaxonDescription")
 @Entity
 public class TaxonDescription extends DescriptionBase {
-       
-       static Logger logger = Logger.getLogger(TaxonDescription.class);
+       private static final long serialVersionUID = 8065879180505546803L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(TaxonDescription.class);
 
        @XmlElementWrapper(name = "Scopes")
        @XmlElement(name = "Scope")

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
index 2b9475ba349c55285027ae7d06ae4b640fc5fe3d..5298dc7e3e0becb71f5ff715ae7f3bf9443eabb0 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
@@ -27,8 +27,6 @@ import eu.etaxonomy.cdm.jaxb.MultilanguageTextAdapter;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageText;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 
 // FIXME
@@ -55,7 +53,8 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 @XmlRootElement(name = "TaxonInteraction")
 @Entity
 public class TaxonInteraction extends DescriptionElementBase {
-       
+       private static final long serialVersionUID = -5014025677925668627L;
+       @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(TaxonInteraction.class);
        
        @XmlElement(name = "Description")
@@ -109,6 +108,7 @@ public class TaxonInteraction extends DescriptionElementBase {
        /**
         * @see #getDescription() 
         */
+       @SuppressWarnings("unused")
        private void setDescription(MultilanguageText description){
                this.description = description;
        }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonNameDescription.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonNameDescription.java
index e044c87daf4214162c0d5b3d8da9460648bb3233..47948f58f4531bb19acaf0700f83ff06b5d57e4f 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonNameDescription.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonNameDescription.java
@@ -39,10 +39,12 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 @XmlRootElement(name = "TaxonNameDescription")
 @Entity
 public class TaxonNameDescription extends DescriptionBase {
-       static Logger logger = Logger.getLogger(TaxonNameDescription.class);
+       private static final long serialVersionUID = -7349160369642038687L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(TaxonNameDescription.class);
        
        @XmlTransient
-       private TaxonNameBase taxonName;
+       private TaxonNameBase<?,?> taxonName;
 
 
        /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java
index 054b66a0befd392f2ce1b72059d9b73a39ae0b9b..14341875dd89c07a75fc97804e8e464724706dbb 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java
@@ -9,31 +9,32 @@
 
 package eu.etaxonomy.cdm.model.description;
 
-
-import java.util.HashMap;
 import java.util.Map;
 
-import eu.etaxonomy.cdm.jaxb.MultilanguageTextAdapter;
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.LanguageString;
-import eu.etaxonomy.cdm.model.common.MultilanguageText;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
-
-import org.apache.log4j.Logger;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.ManyToOne;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
+import javax.persistence.Transient;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlIDREF;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import org.apache.log4j.Logger;
+import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
+
+import eu.etaxonomy.cdm.jaxb.MultilanguageTextAdapter;
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.LanguageString;
+import eu.etaxonomy.cdm.model.common.MultilanguageText;
+
 /**
  * This class represents information pieces expressed in one or several natural
  * languages (for the {@link Feature feature} "medical use" for instance).
@@ -54,8 +55,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 @XmlRootElement(name = "TextData")
 @Entity
 public class TextData extends DescriptionElementBase {
-       
-       static Logger logger = Logger.getLogger(TextData.class);
+       private static final long serialVersionUID = -2165015581278282615L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(TextData.class);
 
        //@XmlElement(name = "MultiLanguageText", type = MultilanguageText.class)
        @XmlElement(name = "MultiLanguageText")

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java
index db432b7d61282003a2b9fc8906e9cde41f0328d3..7c9efcea321624080fbc58dbd649620d8e6495a1 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java
@@ -10,18 +10,16 @@
 package eu.etaxonomy.cdm.model.description;
 
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.name.NameRelationship;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-
-
-import org.apache.log4j.Logger;
-import javax.persistence.*;
+import javax.persistence.Entity;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.log4j.Logger;
+
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+
 /**
  * The class representing kinds of formats used for structuring text
  * (like "xml schema namespace", "rdf", or any other format).
@@ -34,8 +32,10 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "TextFormat")
 @XmlRootElement(name = "TextFormat")
 @Entity
-public class TextFormat extends DefinedTermBase {
-       static Logger logger = Logger.getLogger(TextFormat.class);
+public class TextFormat extends DefinedTermBase<TextFormat> {
+       private static final long serialVersionUID = 2063382669537212917L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(TextFormat.class);
        
        // ************* CONSTRUCTORS *************/    
        /**