Performed project cleanup.
authora.babadshanjan <a.babadshanjan@localhost>
Tue, 5 Aug 2008 12:10:34 +0000 (12:10 +0000)
committera.babadshanjan <a.babadshanjan@localhost>
Tue, 5 Aug 2008 12:10:34 +0000 (12:10 +0000)
111 files changed:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/CdmDocumentBuilder.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/CdmResourceResolver.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/CdmSchemaGenerator.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/UUIDAdapter.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/DataSet.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembership.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/AnnotatableEntity.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/EventBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Extension.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ICdmBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IIdentifiableEntitiy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IParsable.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Marker.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageSet.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermVocabulary.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OriginalSource.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Representation.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TimePeriod.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermLoader.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/TdwgArea.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/IdentifyableMediaEntity.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/MediaRepresentation.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaSample.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/GenBankAccession.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Locus.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/CultivarPlantName.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/HomotypicalGroup.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatus.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationStatus.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ViralName.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/Collection.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/SpecimenOrObservationBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Article.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/BibtexEntryType.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/BibtexReference.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Book.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/BookSection.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/CdDvd.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Database.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Generic.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/INomenclaturalReference.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/InProceedings.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Journal.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Map.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/NomenclaturalReferenceHelper.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Patent.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PersonalCommunication.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PrintSeries.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PrintedUnitBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Proceedings.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PublicationBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Report.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/SectionBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/StrictReferenceBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Thesis.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/WebPage.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationship.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationshipType.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonComparator.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationship.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/INomenclaturalAuthorCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/TeamDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/ZooNameDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/ArticleDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/BibtexDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/BookDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/BookSectionDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/GenericDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/NomRefDefaultCacheStrategyBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DataSetTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DatabaseInitialiser.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/CdmBaseTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/DefinedTermBaseTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/MarkerTypeTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/TermVocabularyTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/DefaultVocabularyStoreTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameBaseTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonComparatorTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestSpecimen.java

index 475fe6f12d4075751bb222ee96e340202e8a077b..ba89bcb84c4bfe51fb8fe1064996c17a213e364c 100644 (file)
@@ -1,26 +1,18 @@
 package eu.etaxonomy.cdm.jaxb;\r
 \r
 import java.io.File;\r
-import java.io.FileOutputStream;\r
 import java.io.IOException;\r
 import java.io.Writer;\r
 \r
-import javax.xml.XMLConstants;\r
 import javax.xml.bind.JAXBContext;\r
 import javax.xml.bind.JAXBException;\r
 import javax.xml.bind.Marshaller;\r
 import javax.xml.bind.Unmarshaller;\r
-import javax.xml.transform.Source;\r
-import javax.xml.transform.stream.StreamSource;\r
-import javax.xml.validation.Schema;\r
-import javax.xml.validation.SchemaFactory;\r
-\r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
 import org.xml.sax.SAXException;\r
 \r
 import eu.etaxonomy.cdm.model.DataSet;\r
-import eu.etaxonomy.cdm.strategy.cache.reference.BookDefaultCacheStrategy;\r
 \r
 /*\r
 Initializes a JaxbContext with one class (eu.etaxonomy.cdm.model.DataSet) \r
index 7ad75d62fb184ee6598bc8ee1ccb28790b21ba7e..7c93b7bca34fd70e00694ac4aafc4d993046be1b 100644 (file)
@@ -5,7 +5,6 @@ import java.util.Properties;
 \r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
-import org.apache.log4j.Logger;\r
 import org.apache.xml.resolver.CatalogManager;\r
 import org.apache.xml.resolver.tools.CatalogResolver;\r
 import org.w3c.dom.ls.LSInput;\r
index f475c8d7efe46832c6253265e22e1bb1791d769b..e0e9ce4bd5b79f2911f0ab3315e4b004565ea1ad 100644 (file)
@@ -12,8 +12,6 @@ import java.io.File;
 import java.io.IOException;\r
 import java.io.StringReader;\r
 import java.io.StringWriter;\r
-import java.io.Writer;\r
-\r
 import javax.xml.bind.JAXBContext;\r
 import javax.xml.bind.JAXBException;\r
 import javax.xml.bind.SchemaOutputResolver;\r
index 5acd4d1abeab8bc9a001be12b9d29fa72664291b..a9729868a728a92185eb44b1c7bba9fa2fd0071b 100644 (file)
@@ -9,8 +9,6 @@
 \r
 package eu.etaxonomy.cdm.jaxb;\r
 \r
-import java.util.UUID;\r
-\r
 import javax.xml.bind.annotation.adapters.XmlAdapter;\r
 \r
 import org.apache.log4j.Logger;\r
index 69b02b4e432fdaba91a404e4aca274107370f710..379e8f014b15cbb926bde7fe8ddf6443b7daca8c 100644 (file)
@@ -1,6 +1,5 @@
 package eu.etaxonomy.cdm.model;\r
 \r
-import java.util.ArrayList;\r
 import java.util.Collection;\r
 import java.util.HashSet;\r
 import java.util.List;\r
@@ -21,7 +20,6 @@ import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
-import eu.etaxonomy.cdm.model.common.IRelated;\r
 import eu.etaxonomy.cdm.model.common.Keyword;\r
 import eu.etaxonomy.cdm.model.common.RelationshipBase;\r
 import eu.etaxonomy.cdm.model.common.TermBase;\r
@@ -309,7 +307,7 @@ public class DataSet {
     public Collection<TaxonBase> getTaxonBases() {\r
        \r
         // FIXME: This is a dirty trick.\r
-       Object obj = (Object)taxa;\r
+       Object obj = taxa;\r
        Collection<TaxonBase> taxonBases = (Collection<TaxonBase>)obj;\r
         return taxonBases;\r
     }\r
index ab608adfeb56dc7a99302c43f107b3655df66dae..193d6d87961492d04daff345ac354e9de244c1f1 100644 (file)
@@ -20,9 +20,7 @@ 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.XmlType;
 
 /**
index b788f0cbdbe42178666ec1da51b39b79bd5230d9..97154d6d9c2a1be6a83fdfb8748e835cfc81f691 100644 (file)
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlIDREF;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * Allows to hold one {@link Institution institution} to which a {@link Person person} is affiliated.
index f94334a513263be49b94866c1a5dbac5c48c3203..737ff0c449c291febfa1dd35dc2a6840ad27f0af 100644 (file)
@@ -20,7 +20,6 @@ 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.XmlType;
 
 /**
index aeb901b2cec7b17479f1319cf7a53905155a6408..a7362dd33da31f1893fcff51eab55b6baa6f6938 100644 (file)
@@ -17,8 +17,6 @@ import javax.xml.bind.annotation.XmlType;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.strategy.cache.agent.INomenclaturalAuthorCacheStrategy;\r
 \r
 \r
index 447d0c9156e45837687be8cbe7bb12481e4e857d..6e9b9d82e61f016b3e24cd904fc78e6a5e8af599 100644 (file)
@@ -13,8 +13,6 @@ import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
-import eu.etaxonomy.cdm.model.media.Rights;
-
 import java.util.*;
 
 import javax.persistence.*;
@@ -97,13 +95,14 @@ public abstract class AnnotatableEntity<T extends AnnotatableEntity> extends Ver
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.model.common.VersionableEntity#clone()
         */
+       @Override
        public Object clone() throws CloneNotSupportedException{
                AnnotatableEntity result = (AnnotatableEntity)super.clone();
                
                //Annotations
                Set<Annotation> newAnnotations = getNewAnnotationSet();
                for (Annotation annotation : this.annotations ){
-                       Annotation newExtension = (Annotation)annotation.clone(this);
+                       Annotation newExtension = annotation.clone(this);
                        newAnnotations.add(newExtension);
                }
                result.setAnnotations(newAnnotations);
@@ -112,7 +111,7 @@ public abstract class AnnotatableEntity<T extends AnnotatableEntity> extends Ver
                //Markers
                Set<Marker> newMarkers = getNewMarkerSet();
                for (Marker marker : this.markers ){
-                       Marker newMarker = (Marker)marker.clone(this);
+                       Marker newMarker = marker.clone(this);
                        newMarkers.add(newMarker);
                }
                result.setMarkers(newMarkers);
index a372f4fc0c309fd11b17187a71d68af673428091..35ac1356ee8132e8515418fa095df6bcb2828d45 100644 (file)
@@ -141,6 +141,7 @@ public class Annotation extends LanguageStringBase implements Cloneable {
        /* (non-Javadoc)
         * @see java.lang.Object#clone()
         */
+       @Override
        public Object clone() throws CloneNotSupportedException{
                Annotation result = (Annotation)super.clone();
                //no changes to: type, flag
index b2b41084f3d8d31299db3df2f25df630b543b06d..7cb45a9f0925c4b5e35ced32488365d7c70c43c0 100644 (file)
@@ -301,6 +301,7 @@ public abstract class CdmBase implements Serializable, ICdmBase{
        /* (non-Javadoc)
         * @see java.lang.Object#clone()
         */
+       @Override
        public Object clone() throws CloneNotSupportedException{
                CdmBase result = (CdmBase)super.clone();
                
index ede6c35935790abed8693671096dea74b6728f36..dc75f2a759fd5071053b316b708fedb3026a4528 100644 (file)
@@ -18,8 +18,6 @@ import au.com.bytecode.opencsv.CSVWriter;
 import eu.etaxonomy.cdm.model.common.init.DefaultVocabularyStore;
 import eu.etaxonomy.cdm.model.common.init.IVocabularyStore;
 import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.cdm.model.name.Rank;
-
 import java.lang.reflect.Field;
 import java.util.*;
 
index 3ce077947259019c41baabac605af75614a077f4..ea7004dd18c9ceebc659b318e328c89fd1a62b69 100644 (file)
@@ -1,6 +1,5 @@
 package eu.etaxonomy.cdm.model.common;
 
-import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 import javax.persistence.MappedSuperclass;
 
index 19146f691349038fd7f024e46a7492a81bd31d51..719902361bdc080c06c189bd7a84c6964688ed05 100644 (file)
@@ -70,6 +70,7 @@ public class Extension extends VersionableEntity implements Cloneable {
        /* (non-Javadoc)
         * @see java.lang.Object#clone()
         */
+       @Override
        public Object clone() throws CloneNotSupportedException{
                Extension result = (Extension)super.clone();    
                //no changes to: type, value
index d85cd0973e3e16f477cabde465f28947024eec4f..afda1c317f5332280383cab5a761760d1116029d 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.cdm.model.common;
 
 import org.apache.log4j.Logger;
 
-import java.util.*;
 import javax.persistence.*;
 
 /**
index def8aa75a6c6df87db58e2711fb1325ccc782a57..25aa9e456592384446c3891ef3a82d6e264816bc 100644 (file)
@@ -9,8 +9,6 @@ import javax.persistence.Id;
 import javax.persistence.ManyToOne;\r
 import javax.persistence.Temporal;\r
 import javax.persistence.TemporalType;\r
-import javax.persistence.Transient;\r
-\r
 import org.hibernate.annotations.Cascade;\r
 import org.hibernate.annotations.CascadeType;\r
 import org.joda.time.DateTime;\r
index ee2620c4eea0c18ac73b5ff1f674609d764f76f7..94d089c85693ebbc117579975446ddb2437ddddb 100644 (file)
@@ -10,8 +10,6 @@ import org.hibernate.annotations.CascadeType;
 \r
 import eu.etaxonomy.cdm.model.media.Rights;\r
 \r
-import org.apache.log4j.Logger;\r
-\r
 public interface IIdentifiableEntitiy<T extends IdentifiableEntity> {\r
 \r
        public abstract String getLsid();\r
index 293186a041cb3231717203c801e1ab3af1ba5279..f276be885ca831556314ed4fbb1c155bb6677f83 100644 (file)
@@ -9,8 +9,6 @@
 \r
 package eu.etaxonomy.cdm.model.common;\r
 \r
-import org.apache.log4j.Logger;\r
-\r
 /**\r
  * @author a.mueller\r
  * @created 21.05.2008\r
index f7cf5d39fa661534412488e78970ccc3f6d0838f..0c3e4843a6566920fc981a3a4593a1872d723ed2 100644 (file)
@@ -266,13 +266,14 @@ public abstract class IdentifiableEntity<T extends IdentifiableEntity> extends A
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.model.common.AnnotatableEntity#clone()
         */
+       @Override
        public Object clone() throws CloneNotSupportedException{
                IdentifiableEntity result = (IdentifiableEntity)super.clone();
                
                //Extensions
                Set<Extension> newExtensions = getNewExtensionSet();
                for (Extension extension : this.extensions ){
-                       Extension newExtension = (Extension)extension.clone(this);
+                       Extension newExtension = extension.clone(this);
                        newExtensions.add(newExtension);
                }
                result.setExtensions(newExtensions);
@@ -280,7 +281,7 @@ public abstract class IdentifiableEntity<T extends IdentifiableEntity> extends A
                //OriginalSources
                Set<OriginalSource> newOriginalSources = getNewOriginalSourcesSet();
                for (OriginalSource originalSource : this.sources){
-                       OriginalSource newSource = (OriginalSource)originalSource.clone(this);
+                       OriginalSource newSource = originalSource.clone(this);
                        newOriginalSources.add(newSource);      
                }
                result.setSources(newOriginalSources);
index d9a1ff8a0619e0614a4fa663ceb5556c6f566627..0e27c3781fda7499d09913ad11e1a412cf98448f 100644 (file)
@@ -20,8 +20,6 @@ import javax.persistence.*;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 /**
@@ -230,6 +228,7 @@ public class Language extends DefinedTermBase {
                return result;
        }
        
+       @Override
        public void writeCsvLine(CSVWriter writer) {
                String [] line = new String[6];
                line[0] = getUuid().toString();
index a59e0238d79a2684834254a381f77cf9e0eea2f4..07cd0e1adb68f2501cf7ac74e09175baa8461000 100644 (file)
@@ -115,6 +115,7 @@ public class Marker extends VersionableEntity implements Cloneable{
        /* (non-Javadoc)
         * @see java.lang.Object#clone()
         */
+       @Override
        public Object clone() throws CloneNotSupportedException{
                Marker result = (Marker)super.clone();
                //no changes to: type, flag
index e94f068119211b5472df22c8617cdb1868641288..fe329298537bd8496820101d5ccb25ef6959da9b 100644 (file)
@@ -12,8 +12,6 @@ package eu.etaxonomy.cdm.model.common;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
-
 import java.util.*;
 
 import javax.persistence.*;
index 260eceb32d641316ad89f42e4564d8419d913dd2..2ef71babff0550c82f362deb51cce8d557c0a30b 100644 (file)
@@ -9,11 +9,8 @@
 
 package eu.etaxonomy.cdm.model.common;
 
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
-
 import org.apache.log4j.Logger;
 
 
index 0160a25fa3f90289bc0cd9a7fff6133621eedb15..9463c5094d3ac238479c96e5e7dac67b888a7aff 100644 (file)
@@ -16,7 +16,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import javax.persistence.*;
 
@@ -148,6 +147,7 @@ public abstract class OrderedTermBase<T extends OrderedTermBase> extends Defined
                }
        }
        
+       @Override
        public boolean equals(Object o){
                if (! OrderedTermBase.class.isAssignableFrom(o.getClass())){
                        return false;
index e6f1b29e847d15fd030760acf20f5953be932f77..9b8efc21c0b372471f6bbb5d12320ed63115cb70 100644 (file)
@@ -149,7 +149,7 @@ public class OrderedTermVocabulary<T extends OrderedTermBase> extends TermVocabu
                if (sortedTerms.size() == 0){\r
                        lowestOrderIndex = 0;\r
                }else{\r
-                       Object first = (T)sortedTerms.first();\r
+                       Object first = sortedTerms.first();\r
                        lowestOrderIndex = ((T)first).orderIndex;\r
                }\r
                term.orderIndex = lowestOrderIndex + 1;\r
index 980e2b1c894846e8c41368d035a062bde1e2dbfb..e6cbca3913a04f297c23af0cb910a622b321644a 100644 (file)
 package eu.etaxonomy.cdm.model.common;
 
 
-import org.hibernate.annotations.CascadeType;
 import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
 import javax.persistence.Transient;
 
 import org.apache.log4j.Logger;
-import org.hibernate.annotations.Cascade;
 
 /**
  * Other names/labels/titles (abreviated or not) for the same object (person,
@@ -105,6 +102,7 @@ public class OriginalSource extends ReferencedEntityBase implements Cloneable{
        /* (non-Javadoc)
         * @see java.lang.Object#clone()
         */
+       @Override
        public Object clone() throws CloneNotSupportedException{
                OriginalSource result = (OriginalSource)super.clone();
                
index b0e93b7e601969fede42dad1b3226be554e76a4c..66b8dac254221700648ad9d8493c7910a5fc5804 100644 (file)
@@ -15,7 +15,6 @@ import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
-import java.util.*;
 import javax.persistence.*;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -101,6 +100,7 @@ public abstract class ReferencedEntityBase extends AnnotatableEntity implements
        /* (non-Javadoc)
         * @see java.lang.Object#clone()
         */
+       @Override
        public Object clone() throws CloneNotSupportedException{
                ReferencedEntityBase result = (ReferencedEntityBase)super.clone();
                
index 86379297173343bc365304edbf2ae862115b766f..178ec163214ebc0c4ea674268b94bfe626ee7cff 100644 (file)
@@ -9,13 +9,9 @@
 
 package eu.etaxonomy.cdm.model.common;
 
-import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
-
 import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
@@ -23,13 +19,10 @@ import org.hibernate.annotations.CascadeType;
 import javax.persistence.*;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
 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;
 
 /**
index 9a594758aa6f8ac4008f5f8e6f7b5c7a8fdaa06a..438c6d3cbd568b912f77b2fab82693dfe54d4d13 100644 (file)
@@ -126,10 +126,11 @@ public abstract class RelationshipTermBase<T extends RelationshipTermBase> exten
                return this.getInverseRepresentation(lang).getDescription();
        }
        
+       @Override
        public ILoadableTerm readCsvLine(List csvLine) {
                RelationshipTermBase result;
                // read UUID, URI, english label+description
-               List<String> csvLineString = (List<String>)csvLine;
+               List<String> csvLineString = csvLine;
                result = (RelationshipTermBase)super.readCsvLine(csvLineString);
                // inverse label + 2 booleans
                String inverseText = csvLineString.get(5).trim();
@@ -141,6 +142,7 @@ public abstract class RelationshipTermBase<T extends RelationshipTermBase> exten
                return result;
        }
        
+       @Override
        public void writeCsvLine(CSVWriter writer) {
                String [] line = new String[8];
                line[0] = getUuid().toString();
index 9f0c1ef051c4ed3d2e90c68ad2a1e7a59b12f4c9..d5299238c87f48360b9cceaa30c05fa3a842b348 100644 (file)
@@ -100,6 +100,7 @@ public class Representation extends LanguageStringBase {
        }
        
        
+       @Override
        public String toString(){
                // we dont need the language returned too, do we? 
                return getLabel();
index 7955aecaf079f5dc02d84b3fc9425f7811c96974..8dfc77672fb49b73eea2564a5fe3e55807f0679c 100644 (file)
@@ -14,7 +14,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.log4j.Logger;
index 3f2f488865302fdbc3c2479f69bdc79c8540c916..3d57da5c4f93bdf80042c28d70a849414d8f0f37 100644 (file)
@@ -47,7 +47,7 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
                return null;
        }
        public static final TermVocabulary getUUID(UUID uuid){
-               return (TermVocabulary)findByUuid(uuid);
+               return findByUuid(uuid);
        }
        public static final TermVocabulary LANGUAGE(){
                return getUUID(uuidLanguage);
index e0f8e0018e739e9743b51e7f7a01503f88ea4d24..f654d102677af9949ecd4843722ec8f6fba15fba 100644 (file)
@@ -18,8 +18,6 @@ import javax.persistence.Transient;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.reference.Generic;
-
 /**
  * @author m.doering
  * @version 1.0
@@ -112,6 +110,7 @@ public class TimePeriod implements Cloneable{
        /* (non-Javadoc)
         * @see java.lang.Object#clone()
         */
+       @Override
        public TimePeriod clone()  {
                try {
                        TimePeriod result = (TimePeriod)super.clone();
index 514b833b66623c977b873f0a2854671e511e5d57..98727b62955a2ac69c6f5d93aeed228b6de90e13 100644 (file)
@@ -190,6 +190,7 @@ public abstract class VersionableEntity<T extends VersionableEntity> extends Cdm
         * The createdWhen is set to the current date.
         * @see java.lang.Object#clone()
         */
+       @Override
        public Object clone() throws CloneNotSupportedException{
                VersionableEntity result = (VersionableEntity)super.clone();
                
index 304c00c83a9703494db4042f5fe58c7fb8983fd7..2487ffda04f7c39760f7ef0e1cbe3ea5e205c825 100644 (file)
@@ -30,7 +30,6 @@ import eu.etaxonomy.cdm.model.location.Continent;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
-import eu.etaxonomy.cdm.model.location.TdwgArea;
 import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;
 import eu.etaxonomy.cdm.model.name.HybridRelationshipType;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
index 58867da42995de016b4abcc9c5900afae8130bd8..c73e365fc848a2eb35628217b5ac63fdd79289dd 100644 (file)
@@ -11,11 +11,8 @@ package eu.etaxonomy.cdm.model.description;
 
 
 import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
-
 import org.apache.log4j.Logger;
 
-import java.util.*;
 import javax.persistence.*;
 
 /**
index 4cda98e4118805cc294f32dff6c0b73baa8cecad..1c2b7f5c6d39fdde11029f2a1286ba017449e3e1 100644 (file)
@@ -10,7 +10,6 @@
 package eu.etaxonomy.cdm.model.description;
 
 
-import java.util.HashMap;
 import java.util.Map;
 
 import eu.etaxonomy.cdm.model.common.Language;
@@ -20,8 +19,6 @@ import eu.etaxonomy.cdm.model.common.MultilanguageSet;
 import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
-import org.hibernate.annotations.CollectionOfElements;
-
 import javax.persistence.*;
 
 /**
index 4fddf1e1549a07f359fa96926d40fa7feedff01f..d69d3cf2a8eb74650665a7f37c4366fa9c9f5e12 100644 (file)
@@ -20,8 +20,6 @@ import javax.persistence.Entity;
 import org.apache.log4j.Logger;\r
 import org.jdom.Element;\r
 import org.jdom.Namespace;\r
-import org.jdom.filter.Filter;\r
-\r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.common.XmlHelp;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
index 044536f3c66e031c73dedb0051166d60e7bca2f3..4a3d932d2d6de73669d0ab593ee538114229c9af 100644 (file)
@@ -27,8 +27,6 @@ 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.XmlSchemaType;
 
 /**
  * +/- current ISO codes. year given with each entry
index 6045e38d73b55a18ef0e46703e79f0940c07b0fc..6e985a011a07f403f04be9e57494d858982b1b74 100644 (file)
@@ -11,9 +11,7 @@ import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
-import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 
 @MappedSuperclass
 public abstract class IdentifyableMediaEntity extends IdentifiableEntity implements IMediaDocumented, IMediaEntity{
@@ -51,6 +49,7 @@ public abstract class IdentifyableMediaEntity extends IdentifiableEntity impleme
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.model.common.IdentifiableEntity#clone()
         */
+       @Override
        public Object clone() throws CloneNotSupportedException{
                IdentifyableMediaEntity result = (IdentifyableMediaEntity)super.clone();
                //Media
index 3261aa827c2385c166e04af342320711c70aeaa1..635436399623a0559d0ea25f18d3ea3637dc6759 100644 (file)
@@ -12,10 +12,6 @@ package eu.etaxonomy.cdm.model.media;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
 import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
index fe115969505b04c5b2d40318375fac445bf9847e..dcb8a210548d35ea053e44e17118d9dc4fbfbf85 100644 (file)
@@ -11,10 +11,8 @@ package eu.etaxonomy.cdm.model.molecular;
 
 
 import eu.etaxonomy.cdm.model.occurrence.Collection;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.occurrence.Specimen;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import org.apache.log4j.Logger;
 
 import java.util.*;
index b1b12c70ebe15151f9241a7d5bc43d182d3fdd11..3633cd20e9a2dd6d62c8706e61c03b16431f4535 100644 (file)
@@ -13,7 +13,6 @@ package eu.etaxonomy.cdm.model.molecular;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import org.apache.log4j.Logger;
 
-import java.util.*;
 import javax.persistence.*;
 
 /**
index da3eebe6bcc9c67ec5763bb423a942515372e054..3739ff45b0f09f6d4b7ce53fe5d89d73db9bacd9 100644 (file)
@@ -13,7 +13,6 @@ package eu.etaxonomy.cdm.model.molecular;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import org.apache.log4j.Logger;
 
-import java.util.*;
 import javax.persistence.*;
 
 /**
index 3a778c047f6e5d4fef511ee299bd1cdf38634f5e..375e20dff35f6ee51496ceb7772285f8627ece63 100644 (file)
@@ -180,6 +180,7 @@ public class Sequence extends IdentifiableEntity implements IReferencedEntity, I
                this.citationMicroReference = citationMicroReference;
        }
 
+       @Override
        public String generateTitle(){
                return "";
        }
index 7dcd9586303b92519e1655fd19818d5a339f2bbe..5f3a9e71f8cb45b346f9a3e6a2fe1b067d3c6af2 100644 (file)
@@ -415,6 +415,7 @@ public class BotanicalName extends NonViralName {
         * @see                         TaxonNameBase#addRelationship(RelationshipBase)
         * @see                         TaxonNameBase#addNameRelationship(NameRelationship)
         */
+       @Override
        @Deprecated  //To be used by RelationshipBase only
        public void addRelationship(RelationshipBase relation) {
                if (relation instanceof HybridRelationship){
index 527b9ea829e98a94987f99241af679f46b1a3e2e..cec1afe499f4e378bdb3161ad9ec0289324e2e5f 100644 (file)
@@ -11,9 +11,6 @@ package eu.etaxonomy.cdm.model.name;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
-
 import javax.persistence.*;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
index ef6baebd20b59a0d06799b67eb510df7a06260bc..35880bcfdd66949187c24415ad951076d007d3be 100644 (file)
@@ -10,7 +10,6 @@
 package eu.etaxonomy.cdm.model.name;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -31,10 +30,8 @@ import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
-import eu.etaxonomy.cdm.model.occurrence.Specimen;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonComparator;
 import eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy;
 
index 10f1698eb6da42ea24423e27c3a15dfe06798c5e..97d88bdec41f6a9a75ef62cdbb67f2f1bebe2e92 100644 (file)
@@ -16,7 +16,6 @@ import javax.persistence.*;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 /**
index 61af929fa28a3326943d569acc3dca44328f8e7c..55baa64e130ace504b3c3ea7a3e3264b7032d76e 100644 (file)
@@ -360,7 +360,7 @@ public class NomenclaturalStatusType extends OrderedTermBase<NomenclaturalStatus
         */
        @Override
        public ILoadableTerm readCsvLine(List csvLine_, Language lang) {
-               List<String> csvLine = (List<String>) csvLine_;
+               List<String> csvLine = csvLine_;
                this.setUuid(UUID.fromString(csvLine.get(0)));
                this.setUri(csvLine.get(1));
                String label = csvLine.get(2).trim();
index 69ed25576a78f301c7a6278311ecc3764de6e342..776f223530d9108d8b38a458a802947c7c2b57d1 100644 (file)
@@ -45,7 +45,6 @@ import eu.etaxonomy.cdm.model.common.IReferencedEntity;
 import eu.etaxonomy.cdm.model.common.IRelated;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.RelationshipBase;
-import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
 import eu.etaxonomy.cdm.model.occurrence.Specimen;
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
@@ -530,7 +529,7 @@ public abstract class TaxonNameBase<T extends TaxonNameBase, S extends INameCach
        @Cascade({CascadeType.SAVE_UPDATE})
        @Target(ReferenceBase.class)
        public INomenclaturalReference getNomenclaturalReference(){
-               return (INomenclaturalReference) this.nomenclaturalReference;
+               return this.nomenclaturalReference;
        }
        /**
         * Assigns a nomenclatural {@link reference.INomenclaturalReference nomenclatural reference} to <i>this</i> taxon name.
index 4139a33d797e771a3dc0fccc758388e2c97de559..b4c615976147a04f097dc4292f3b5c7819b17987 100644 (file)
@@ -12,9 +12,6 @@ package eu.etaxonomy.cdm.model.name;
 
 
 import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
-
 import org.apache.log4j.Logger;
 
 import java.util.*;
index 4cf9424a201183a4367147c6db78515185ee2c6a..735b5c57fa3a17852f305d377f6b67cc53c2290c 100644 (file)
@@ -12,11 +12,7 @@ package eu.etaxonomy.cdm.model.name;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy;
-import eu.etaxonomy.cdm.strategy.cache.name.INonViralNameCacheStrategy;
-
 import javax.persistence.*;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
index 4b23060f9dd7139881eaad70594afe4c350c15ec..fb9192bd1e2ccbe808550429f9ee6a03f5812169 100644 (file)
@@ -11,7 +11,6 @@ package eu.etaxonomy.cdm.model.occurrence;
 
 
 import eu.etaxonomy.cdm.model.agent.Institution;
-import eu.etaxonomy.cdm.model.description.Scope;
 import eu.etaxonomy.cdm.model.media.IdentifyableMediaEntity;
 
 import org.apache.log4j.Logger;
@@ -118,6 +117,7 @@ public class Collection extends IdentifyableMediaEntity{
                this.townOrLocation = townOrLocation;
        }
 
+       @Override
        public String generateTitle(){
                return "";
        }
index 9a72dff22fd71ad19e99d50a1224e1869a8dc921..7ec23eb227fd119db18d2b81f2389d16caab92c9 100644 (file)
@@ -14,7 +14,6 @@ import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageSet;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.Sex;
-import eu.etaxonomy.cdm.model.description.SpecimenDescription;
 import eu.etaxonomy.cdm.model.description.Stage;
 import eu.etaxonomy.cdm.model.media.IdentifyableMediaEntity;
 
@@ -130,6 +129,7 @@ public abstract class SpecimenOrObservationBase extends IdentifyableMediaEntity{
        }
        
        
+       @Override
        public String generateTitle(){
                return "";
        }
index 2cd6e5b29251ed3f499a4694a5c00f591fc2077b..742d3b8eab8e7fafe30f55ed11626e26894e5ef7 100644 (file)
@@ -191,6 +191,7 @@ public class Article extends StrictReferenceBase implements INomenclaturalRefere
         * @see  NomenclaturalReferenceHelper#getCitation()
         * @see  StrictReferenceBase#getCitation()
         */
+       @Override
        @Transient
        public String getCitation(){
                return nomRefBase.getCitation();
@@ -247,6 +248,7 @@ public class Article extends StrictReferenceBase implements INomenclaturalRefere
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public Article clone(){
                Article result = (Article)super.clone();
                //no changes to: inJournal, pages, series, volume
index 1c3ab3f619eb9bdd22a2fdebe8de49ad90514097..c049b716d46ae68ffe4bc9b2ea74e25bded4f87c 100644 (file)
@@ -15,7 +15,6 @@ import javax.persistence.Entity;
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
 
 /**
  * The class representing types (categories) of {@link BibtexReference BibTeX references}
index 72429cb61a506a578770448241bdbf45f0607dcc..1b1884bc91b68879985c20f80562659c3e5b2654 100644 (file)
@@ -20,7 +20,6 @@ import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
-import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.strategy.cache.reference.BibtexDefaultCacheStrategy;
 
 /**
@@ -505,6 +504,7 @@ public class BibtexReference extends ReferenceBase implements INomenclaturalRefe
         * 
         * @return  the string with the year of publication
         */
+       @Override
        public String getYear(){
                return this.year;
        }
@@ -583,6 +583,7 @@ public class BibtexReference extends ReferenceBase implements INomenclaturalRefe
         * 
         * @see  NomenclaturalReferenceHelper#getCitation()
         */
+       @Override
        @Transient
        public String getCitation(){
                return nomRefBase.getCitation();
@@ -620,6 +621,7 @@ public class BibtexReference extends ReferenceBase implements INomenclaturalRefe
         * @see         common.IdentifiableEntity#getTitleCache()
         * @see         common.IdentifiableEntity#generateTitle()
         */
+       @Override
        public String generateTitle(){
                return nomRefBase.generateTitle();
        }
index c4497d4916eb39d78cde84f4df6940c358e38f78..0b125da51ea7578c6b16932698a6d7fec7661962 100644 (file)
@@ -19,7 +19,6 @@ import javax.xml.bind.annotation.XmlType;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.strategy.cache.reference.BookDefaultCacheStrategy;
 
 /**
@@ -129,6 +128,7 @@ public class Book extends PrintedUnitBase implements INomenclaturalReference, Cl
         * @see  NomenclaturalReferenceHelper#getCitation()
         * @see  StrictReferenceBase#getCitation()
         */
+       @Override
        @Transient
        public String getCitation(){
                return nomRefBase.getCitation();
@@ -185,6 +185,7 @@ public class Book extends PrintedUnitBase implements INomenclaturalReference, Cl
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public Book clone(){
                Book result = (Book)super.clone();
                //no changes to: edition, isbn
index f6fdb2266c54f0c405fdf0e50e99e0ffb16db124..f2dba72fc5b408ee05dffa59922b93854787a84f 100644 (file)
@@ -115,6 +115,7 @@ public class BookSection extends SectionBase implements INomenclaturalReference,
         * @see  NomenclaturalReferenceHelper#getCitation()
         * @see  StrictReferenceBase#getCitation()
         */
+       @Override
        @Transient
        public String getCitation(){
                return nomRefBase.getCitation();
@@ -170,6 +171,7 @@ public class BookSection extends SectionBase implements INomenclaturalReference,
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public BookSection clone(){
                BookSection result = (BookSection)super.clone();
                //no changes to: inBook
index b6f80891c473c3e666e62941a8f2cd8c174d7445..33142225c7d407df7e971c6d050448ba2e957793 100644 (file)
@@ -59,6 +59,7 @@ public class CdDvd extends PublicationBase implements Cloneable{
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public CdDvd clone(){
                CdDvd result = (CdDvd)super.clone();
                //no changes to: -
index ef0a564ce6491ea958fef56d64492a7b0e4f23e7..6cfaa3f150c0842b394b4b131fa4874ca51de99b 100644 (file)
@@ -71,6 +71,7 @@ public class Database extends PublicationBase implements Cloneable {
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public Database clone(){
                Database result = (Database)super.clone();
                //no changes to: -
index a3136772090ed1309e20b9acd939fb49626e7378..2fa993f08aca72413f2f8d72b71c55b31cc61698 100644 (file)
@@ -15,9 +15,6 @@ import javax.persistence.Transient;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.strategy.cache.reference.GenericDefaultCacheStrategy;
 
 /**
@@ -211,6 +208,7 @@ public class Generic extends StrictReferenceBase implements INomenclaturalRefere
         * @see  NomenclaturalReferenceHelper#getCitation()
         * @see  StrictReferenceBase#getCitation()
         */
+       @Override
        @Transient
        public String getCitation(){
                return nomRefBase.getCitation();
@@ -270,6 +268,7 @@ public class Generic extends StrictReferenceBase implements INomenclaturalRefere
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public Generic clone(){
                Generic result = (Generic)super.clone();
                //no changes to: editor, pages, placePublished,publisher, series, volume
index 744befb19f52c694d388eee745936df995d3c37e..636adaf8561a33c539543f5c99726ec4d1f42468 100644 (file)
@@ -13,7 +13,6 @@ package eu.etaxonomy.cdm.model.reference;
 import javax.persistence.Transient;
 
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntitiy;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 
 
  /**
index 2668a847d0049fa996a4dcd5d5a3e4fe1835ec87..d9cfac89515d0edce20d759fae5d1ca194f6b13a 100644 (file)
@@ -17,8 +17,6 @@ import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
-import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-
 /**
  * This class represents isolated parts (usually papers or abstracts) within
  * {@link Proceedings conference proceedings}.
index 64c4b3cbfca9724ed632748229f8a77d6044d34e..7a588a60522d745d55abb7caa431376de6ec8eb9 100644 (file)
@@ -109,6 +109,7 @@ public class Journal extends PublicationBase implements Cloneable {
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public Journal clone(){
                return (Journal)super.clone();
        }
index e4d7a6b709f78b43c10960b925cbed57638d644a..666287825d654d31a42949eb28b5099d5d468a57 100644 (file)
@@ -62,6 +62,7 @@ public class Map extends PublicationBase implements Cloneable {
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.model.reference.PublicationBase#clone()
         */
+       @Override
        public Map clone(){
                Map result = (Map)super.clone();
                //no changes to: -
index 00f741fa998797652f63ddecfe6302b795d724ed..f14d0db68b520964c17d1a48a875f08d2c6790cb 100644 (file)
@@ -14,7 +14,6 @@ import javax.persistence.Transient;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.strategy.cache.reference.INomenclaturalReferenceCacheStrategy;\r
 \r
 /**\r
index 003632370924cb6110fd8f64758eb23acff2c784..2c48415bbe44d57d467f485dbce447d8dd3f57f7 100644 (file)
@@ -62,6 +62,7 @@ public class Patent extends StrictReferenceBase implements Cloneable {
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.model.reference.PublicationBase#clone()
         */
+       @Override
        public Patent clone(){
                Patent result = (Patent)super.clone();
                //no changes to: -
index cff8ef2d20f5961c81a3c3108b0fba9ae3faace3..9cc08ef75534059ed7a7d4ab5f7669bf502de110 100644 (file)
@@ -64,6 +64,7 @@ public class PersonalCommunication extends StrictReferenceBase implements Clonea
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.model.reference.PublicationBase#clone()
         */
+       @Override
        public PersonalCommunication clone(){
                PersonalCommunication result = (PersonalCommunication)super.clone();
                //no changes to: -
index c5fc70e6c95bbb21f4afc2ab1fbbb4ad9cf6b77f..e38e5082c5e6122b0ed9f51b71917d3cc9d76fea 100644 (file)
@@ -64,6 +64,7 @@ public class PrintSeries extends PublicationBase implements Cloneable {
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.model.reference.PublicationBase#clone()
         */
+       @Override
        public PrintSeries clone(){
                PrintSeries result = (PrintSeries)super.clone();
                //no changes to: series
index 4b33bc441e0f2ad545c58fa1b7cedf9beb3fb72b..8d2f2ccfb86a0a43c691684b9495e8ec9c0fd2fa 100644 (file)
@@ -141,6 +141,7 @@ public abstract class PrintedUnitBase extends PublicationBase {
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public Object clone(){
                PrintedUnitBase result = (PrintedUnitBase)super.clone();
                //no changes to: editor, inSeries, pages, volume, seriesPart
index 3fbe4d150a27d82d1d39bcd8450ce2eaffc1ea60..fcdb3252e15ffa8ece4639a2699334f1dac6c2fb 100644 (file)
@@ -110,6 +110,7 @@ public class Proceedings extends PrintedUnitBase implements Cloneable {
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+               @Override
                public Proceedings clone(){
                        Proceedings result = (Proceedings)super.clone();
                        //no changes to: organization
index ff641ccfee6c829442d32f1a26cc5580977376f6..0957caaa8656bc396ee1f8985497e790063354e0 100644 (file)
@@ -77,6 +77,7 @@ public abstract class PublicationBase extends StrictReferenceBase {
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public Object clone(){
                PublicationBase result = (PublicationBase)super.clone();
                //no changes to: placePublished, publisher
index 7d0c77526e560ea50077ba8ca273d07cd7ccc303..dec99126a09823b4ad5b4108bd41aa8c11c406d1 100644 (file)
@@ -32,9 +32,7 @@ import org.hibernate.annotations.Table;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.IParsable;
 import eu.etaxonomy.cdm.model.media.IdentifyableMediaEntity;
-import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.strategy.cache.reference.IReferenceBaseCacheStrategy;
 
 /**
@@ -216,6 +214,7 @@ public abstract class ReferenceBase extends IdentifyableMediaEntity implements I
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public Object clone() throws CloneNotSupportedException{
                ReferenceBase result = (ReferenceBase)super.clone();
                //no changes to: authorTeam, hasProblem, nomenclaturallyRelevant, uri
index 4484411b6675b91767e090d2cd1bf853ff099cf5..79a4b088c27140b99373deb0057ecef5e8896cfb 100644 (file)
@@ -105,6 +105,7 @@ public class Report extends PublicationBase implements Cloneable {
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.model.reference.PublicationBase#clone()
         */
+       @Override
        public Report clone(){
                Report result = (Report)super.clone();
                //no changes to: institution
index 74c4e4514021c9d8e0e1e88309e336dee57654d6..a996dbe53b0792f1dcab62dfd23c6800fec66815 100644 (file)
@@ -73,6 +73,7 @@ public abstract class SectionBase extends StrictReferenceBase {
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public Object clone(){
                SectionBase result = (SectionBase)super.clone();
                //no changes to: pages
index 3a519ae88923d2c6baac9e23af00bfd159f4e443..f036397c41c4a6ce226e806e63291b44e47b2b85 100644 (file)
@@ -95,6 +95,7 @@ public abstract class StrictReferenceBase extends ReferenceBase{
         * 
         * @see  #getTitle()
         */
+       @Override
        @Transient
        // TODO implement 
        public String getCitation(){
@@ -106,6 +107,7 @@ public abstract class StrictReferenceBase extends ReferenceBase{
         * of <i>this</i> reference. The string is obtained by transformation of
         * the {@link #getDatePublished() datePublished} attribute.
         */
+       @Override
        @Transient
        public String getYear(){
                if (this.getDatePublished() == null){
@@ -128,6 +130,7 @@ public abstract class StrictReferenceBase extends ReferenceBase{
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public Object clone() {
                try {
                        StrictReferenceBase result = (StrictReferenceBase)super.clone();
index 874fd6594a7cd5664f95a400331589abb11bb9be..82dcad855f95c66f28cd0794e29168c2918e974f 100644 (file)
@@ -104,6 +104,7 @@ public class Thesis extends PublicationBase implements Cloneable{
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.model.reference.PublicationBase#clone()
         */
+       @Override
        public Thesis clone(){
                Thesis result = (Thesis)super.clone();
                //no changes to: institution
index 5e509c935635855c2ea05d45500798775e5dab29..b1ceb0dd7c7bd7a70a16d15d91948bcd304289ca 100644 (file)
@@ -73,6 +73,7 @@ public class WebPage extends PublicationBase implements Cloneable {
         * @see media.IdentifyableMediaEntity#clone()
         * @see java.lang.Object#clone()
         */
+       @Override
        public WebPage clone(){
                WebPage result = (WebPage)super.clone();
                //no changes to: -
index c6f1bf24a88cf93a30776243fb11dd5ee76337eb..431463db1db119e9e7670fe5baf8bfc5448357b2 100644 (file)
@@ -12,9 +12,6 @@ package eu.etaxonomy.cdm.model.taxon;
 import eu.etaxonomy.cdm.model.common.IRelated;
 import eu.etaxonomy.cdm.model.common.RelationshipBase;
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
-import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 
 import org.apache.log4j.Logger;
index c2503f6a70cbaa3e58d94f467f4f80ce1b86be0a..c7daba18579e56acd55fb376e0a3584a7ffb0f05 100644 (file)
@@ -19,7 +19,6 @@ import javax.xml.bind.annotation.XmlType;
 
 import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
-import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 
 /**
  * The class representing categories of {@link SynonymRelationship synonym relationships}
index 03b64429ba658ccc11c88b2d7bbcfaf8edc0d35d..ecb0bc33a504baa4ffeb6a34f075c481875a412d 100644 (file)
@@ -14,14 +14,7 @@ import eu.etaxonomy.cdm.model.common.IRelated;
 import eu.etaxonomy.cdm.model.common.RelationshipBase;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.NameRelationship;
-import eu.etaxonomy.cdm.model.name.NameRelationshipType;
-import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
-import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
-import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.cdm.model.name.TypeDesignationStatus;
-import eu.etaxonomy.cdm.model.occurrence.Specimen;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 
 import org.apache.log4j.Logger;
@@ -39,7 +32,6 @@ 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;
 
 /**
index 2dac6d21cfa922f2c747c11ceefe3b6ed34e1979..e9c9468777ec51f6385d0e4e597d4a6e94b26fc4 100644 (file)
@@ -10,8 +10,6 @@
 package eu.etaxonomy.cdm.model.taxon;
 
 import java.lang.reflect.Method;
-import java.util.List;
-
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
@@ -31,10 +29,7 @@ import org.hibernate.annotations.Index;
 import org.hibernate.annotations.Table;
 
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
-import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 
index 63a43f69bb96adb360d01009d13dee44e79ef0f8..5c321565d397115f547c89de103fb6d178590609 100644 (file)
@@ -13,7 +13,6 @@ import java.util.Comparator;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;\r
index a731d3da3f4185eff32493fe3a44114d44d3692a..4fae001e4489ed84b04b4ea67e36fdc6c5d14add 100644 (file)
@@ -10,9 +10,6 @@
 package eu.etaxonomy.cdm.model.taxon;
 
 import eu.etaxonomy.cdm.model.common.RelationshipBase;
-import eu.etaxonomy.cdm.model.name.NameRelationshipType;
-import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 
 import org.apache.log4j.Logger;
index 4f3abbe69270803b7f1137a0ecc17b9468a3e4dc..de980cae3f28d12f57582c95b33b489df76dc8b3 100644 (file)
@@ -1,7 +1,6 @@
 package eu.etaxonomy.cdm.strategy.cache.agent;\r
 \r
 \r
-import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
 import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;\r
 \r
index 256c7e3a6820fa4a84cbd43e47ecde5bc11e275e..70fe9300a948c2f9669ade170eaaede9b85bdd04 100644 (file)
@@ -8,10 +8,8 @@ import java.util.UUID;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.strategy.StrategyBase;\r
 \r
 /**\r
index 314fd226503ce5e9eaa0b20f33c48657ee492089..b1cc17982345acd028f84d0d73da30333e323c1c 100644 (file)
@@ -18,6 +18,7 @@ public class BotanicNameDefaultCacheStrategy<T extends BotanicalName> extends No
        \r
        final static UUID uuid = UUID.fromString("1cdda0d1-d5bc-480f-bf08-40a510a2f223");\r
        \r
+       @Override\r
        public  UUID getUuid(){\r
                return uuid;\r
        }\r
index abd8eced8a8ed6a4b660d79d77d5a151de4989ff..24c5300bcf757b940662da451d1db64cd9d5c2f7 100644 (file)
@@ -15,7 +15,6 @@ import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 \r
 \r
 /**\r
@@ -42,6 +41,7 @@ public class NonViralNameDefaultCacheStrategy<T extends NonViralName> extends Na
        protected String ExAuthorSeperator = " ex ";\r
        protected CharSequence BasionymAuthorCombinationAuthorSeperator = " ";\r
        \r
+       @Override\r
        public  UUID getUuid(){\r
                return uuid;\r
        }\r
index 16951e392142fe0f69d060592861722ac215ea9b..91f6ead75fe8a0ec17a7eda8ac1df38857d98b4d 100644 (file)
@@ -5,9 +5,7 @@ import java.util.UUID;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
-import eu.etaxonomy.cdm.model.agent.Agent;\r
 import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;\r
-import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
 \r
 public class ZooNameDefaultCacheStrategy <T extends ZoologicalName> extends NonViralNameDefaultCacheStrategy<T> implements  INonViralNameCacheStrategy<T> {\r
@@ -17,6 +15,7 @@ public class ZooNameDefaultCacheStrategy <T extends ZoologicalName> extends NonV
 \r
        protected String AuthorYearSeperator = ", ";\r
        \r
+       @Override\r
        public UUID getUuid(){\r
                return uuid;\r
        }\r
index f64287f4ef2bd3ac31f77be7387280a36eb0337b..a130ded110a5ecb896e0c589cb82c57f76e6cd6d 100644 (file)
@@ -51,6 +51,7 @@ public class ArticleDefaultCacheStrategy <T extends Article> extends NomRefDefau
                super();\r
        }\r
 \r
+       @Override\r
        protected String getNomRefTitleWithoutYearAndAuthor(T article){\r
                if (article == null){\r
                        return null;\r
index c67cb4691c45e98088bc0f143a65395a34e3ee71..2868878e1736d24cdcf2c943c64a21a04a4e27a9 100644 (file)
@@ -13,11 +13,7 @@ import java.util.UUID;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
-import eu.etaxonomy.cdm.model.reference.Article;\r
 import eu.etaxonomy.cdm.model.reference.BibtexReference;\r
-import eu.etaxonomy.cdm.model.reference.Book;\r
-import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;\r
-import eu.etaxonomy.cdm.strategy.StrategyBase;\r
 \r
 public class BibtexDefaultCacheStrategy <T extends BibtexReference> extends NomRefDefaultCacheStrategyBase<T>  implements  INomenclaturalReferenceCacheStrategy<T> {\r
        private static final Logger logger = Logger.getLogger(BibtexDefaultCacheStrategy.class);\r
@@ -55,6 +51,7 @@ public class BibtexDefaultCacheStrategy <T extends BibtexReference> extends NomR
                super();\r
        }\r
 \r
+       @Override\r
        protected String getNomRefTitleWithoutYearAndAuthor(T article){\r
                \r
                if (true){\r
index 2e927d887266d1551b73dd44184b3fec9323437e..928935db91cea2c23d81edc9a020e06599b8dec8 100644 (file)
@@ -52,6 +52,7 @@ public class BookDefaultCacheStrategy <T extends Book> extends NomRefDefaultCach
        }\r
 \r
 \r
+       @Override\r
        public String getNomRefTitleWithoutYearAndAuthor(T nomenclaturalReference){\r
                if (nomenclaturalReference == null){\r
                        return null;\r
index b022eab02e5bcb95e189fa69bb9c2b84c0839ff2..1376877b1aa8d178fc855d82e03789b895350805 100644 (file)
@@ -55,6 +55,7 @@ public class BookSectionDefaultCacheStrategy <T extends BookSection> extends Nom
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.strategy.cache.reference.INomenclaturalReferenceCacheStrategy#getTokenizedNomenclaturalTitel(eu.etaxonomy.cdm.model.reference.INomenclaturalReference)\r
         */\r
+       @Override\r
        public String getTokenizedNomenclaturalTitel(T bookSection) {\r
                if (bookSection.getInBook() == null){\r
                        return null;\r
@@ -69,6 +70,7 @@ public class BookSectionDefaultCacheStrategy <T extends BookSection> extends Nom
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.strategy.cache.reference.INomenclaturalReferenceCacheStrategy#getTitleCache(eu.etaxonomy.cdm.model.reference.INomenclaturalReference)\r
         */\r
+       @Override\r
        public String getTitleCache(T bookSection) {\r
                if (bookSection.getInBook() == null){\r
                        return null;\r
index 837d7b9791f74d131ca4325dc1ea131472f09074..bd9eb6bd329ef9d045fe52def7ca1507377a4745 100644 (file)
@@ -52,6 +52,7 @@ public class GenericDefaultCacheStrategy <T extends Generic> extends NomRefDefau
                super();\r
        }\r
        \r
+       @Override\r
        protected String getNomRefTitleWithoutYearAndAuthor(T genericReference){\r
                if (genericReference == null){\r
                        return null;\r
index d8d8bfc145e0329f6fb79e59a5136b7e18b017ac..5afb6d0806a695f71e85b2b35efafa475194ccdb 100644 (file)
@@ -13,7 +13,6 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
-import eu.etaxonomy.cdm.model.reference.Generic;\r
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.strategy.StrategyBase;\r
index 4405a5cdda74e7748fde446d8feb92fe180755ec..c932d937ae6a7979d53017ef401f9a46bd3d7d1a 100644 (file)
@@ -27,7 +27,6 @@ import eu.etaxonomy.cdm.model.reference.BookSection;
 import eu.etaxonomy.cdm.model.reference.Generic;\r
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
-import eu.etaxonomy.cdm.model.reference.StrictReferenceBase;\r
 import eu.etaxonomy.cdm.strategy.exceptions.StringNotParsableException;\r
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
 \r
index 651410e090cc3adb73d49941b58dea051fd87cf4..cd735ddaba02cd52ef8a25eb7d30beac141ef16b 100644 (file)
@@ -28,7 +28,7 @@ import eu.etaxonomy.cdm.model.name.Rank;
                private Object lastPropValue;
 
                public void propertyChange(PropertyChangeEvent e){
-               logger.debug("Property [" + (String)e.getPropertyName() 
+               logger.debug("Property [" + e.getPropertyName() 
                                + "] changed from " + e.getOldValue() 
                                + " to " + e.getNewValue());
                lastPropValue = e.getNewValue() == null ? null : e.getNewValue();
index 1842686b010dc257343b187cef274a4012b5fd59..1969b24c0f23268dcae26a6e7dad169aa2927344 100644 (file)
@@ -1,10 +1,8 @@
 package eu.etaxonomy.cdm.model;\r
 \r
 import java.util.ArrayList;\r
-import java.util.Collection;\r
 import java.util.GregorianCalendar;\r
 import java.util.HashSet;\r
-import java.util.Iterator;\r
 import java.util.List;\r
 import java.util.Set;\r
 \r
@@ -17,20 +15,15 @@ import eu.etaxonomy.cdm.model.agent.Agent;
 import eu.etaxonomy.cdm.model.agent.Institution;\r
 import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
-import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.Keyword;\r
 import eu.etaxonomy.cdm.model.common.RelationshipBase;\r
 import eu.etaxonomy.cdm.model.common.TermBase;\r
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
 import eu.etaxonomy.cdm.model.name.BotanicalName;\r
-import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
-import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
 import eu.etaxonomy.cdm.model.reference.Book;\r
 import eu.etaxonomy.cdm.model.reference.Database;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
@@ -38,9 +31,7 @@ import eu.etaxonomy.cdm.model.reference.StrictReferenceBase;
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
-import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
 \r
 public class DataSetTest {\r
 \r
@@ -225,7 +216,7 @@ public class DataSetTest {
 \r
 //             Set<TaxonRelationship> taxonRelationships;\r
        taxonRelationships = rootT.getTaxonRelations();\r
-       Object obj = (Object)taxonRelationships;\r
+       Object obj = taxonRelationships;\r
        relationshipBases = (Set<RelationshipBase>)obj;\r
                \r
        }\r
index 27b2afc3cd8771c7f16b75509b38fbdb7543990a..4e5ed5c13bebe495db386c4f9bf940a5971a7199 100644 (file)
@@ -56,7 +56,7 @@ public class DatabaseInitialiser {
 
        public static void main(String[] args) {
                DatabaseInitialiser dbInit = new DatabaseInitialiser();
-               dbInit.insertTaxon("Abies alba");
-               dbInit.insertTaxon("Polygala vulgaris");
+               DatabaseInitialiser.insertTaxon("Abies alba");
+               DatabaseInitialiser.insertTaxon("Polygala vulgaris");
        }
 }
index 26434b475971c99f2e2f431f59859f74e27ce008..409678bc2a5265f81607389d8dfb73332b861861 100644 (file)
@@ -15,7 +15,6 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;\r
 import java.beans.PropertyChangeSupport;\r
 import java.lang.reflect.Field;\r
-import java.util.Calendar;\r
 import java.util.UUID;\r
 \r
 import org.apache.log4j.Logger;\r
@@ -41,7 +40,7 @@ public class CdmBaseTest extends EntityTestBase{
 \r
        static public class TestCdmBaseClass extends CdmBase{\r
                public String testString = "testStringXsdfjlksj";\r
-               public float testFloat = (float)1.43446E-5f;\r
+               public float testFloat = 1.43446E-5f;\r
                public boolean testBoolean = false;\r
        }\r
        \r
@@ -318,7 +317,7 @@ public class CdmBaseTest extends EntityTestBase{
                \r
                //Test\r
                float oldValue = testCdm.testFloat;\r
-               float newValue = (float)1.40239846E-4f;\r
+               float newValue = 1.40239846E-4f;\r
                assertFalse(oldValue == newValue);\r
                testCdm.firePropertyChange(prop, oldValue, newValue);\r
                assertTrue(listener.isChanged());\r
@@ -460,8 +459,8 @@ public class CdmBaseTest extends EntityTestBase{
        @Test\r
        public void testSetCreated() {\r
                DateTime calendar = new DateTime();\r
-               DateTime calendarTrue = (DateTime)calendar.withMillisOfSecond(23);\r
-               DateTime calendarFalse = (DateTime)calendar.withMillisOfSecond(23);\r
+               DateTime calendarTrue = calendar.withMillisOfSecond(23);\r
+               DateTime calendarFalse = calendar.withMillisOfSecond(23);\r
                calendarFalse = calendarFalse.plusMonths(5);\r
                cdmBase.setCreated(calendar);\r
                calendar = calendar.withMillisOfSecond(0);\r
index ac29f05f4670f81f0f1fac0a9e6b72e959baeb85..d190513cb63d664f613f018a11fef55b6f0a4dbb 100644 (file)
@@ -9,8 +9,6 @@
  \r
 package eu.etaxonomy.cdm.model.common;\r
 \r
-import static org.junit.Assert.*;\r
-\r
 import org.apache.log4j.Logger;\r
 import org.junit.After;\r
 import org.junit.AfterClass;\r
index ca40ff6677a20637d46fa4b261eb08009e4d58dd..4ea6bd5bb198e74282b03afc707af7a9e6599be5 100644 (file)
@@ -20,8 +20,6 @@ import org.junit.Before;
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
-import eu.etaxonomy.cdm.model.name.Rank;\r
-\r
 /**\r
  * @author a.mueller\r
  * @created 23.04.2008\r
index fa2f16b13168114fd8a8393518737294d410d3b5..909a8a13ac7cc663dfe19cb312c1bb20a90a82e0 100644 (file)
@@ -13,8 +13,6 @@ import static org.junit.Assert.*;
 \r
 import java.util.Iterator;\r
 import java.util.Set;\r
-import java.util.SortedSet;\r
-\r
 import org.apache.log4j.Logger;\r
 import org.junit.After;\r
 import org.junit.AfterClass;\r
index ed948360b66e344f9f8793f6fffb8538d4cedbac..9480b2341640fe463d74e265a2d2185f6d175f1a 100644 (file)
@@ -23,7 +23,6 @@ import org.junit.Test;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.WrongTermTypeException;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
-import eu.etaxonomy.cdm.test.suite.CdmTestSuite;\r
 \r
 /**\r
  * @author AM\r
@@ -72,7 +71,7 @@ public class DefaultVocabularyStoreTest {
        @Test\r
        public void testDEFAULT_LANGUAGE() {\r
                UUID uuidEnglish = UUID.fromString("e9f8cdb7-6819-44e8-95d3-e2d0690c3523");\r
-               assertEquals(uuidEnglish, defaultVocabularyStore.DEFAULT_LANGUAGE().getUuid());\r
+               assertEquals(uuidEnglish, DefaultVocabularyStore.DEFAULT_LANGUAGE().getUuid());\r
        }\r
 \r
        /**\r
index 8eac2c5c425bd5cdec391b78ddee93c20a6ce30e..f15656f0550bcb19bd687f2a9fb7ca64dd70e23e 100644 (file)
@@ -16,7 +16,6 @@ import org.junit.After;
 import org.junit.AfterClass;\r
 import org.junit.Before;\r
 import org.junit.BeforeClass;\r
-import org.junit.Ignore;\r
 import org.junit.Test;\r
 \r
 import eu.etaxonomy.cdm.model.agent.Team;\r
index 8d93201257f0587d25488d9ba5a4e988de6983b2..753fb8de242aa5f80bf3c5c1716b055120a0cd6c 100644 (file)
@@ -66,9 +66,13 @@ public class TaxonNameBaseTest {
                public TaxonNameBaseTestClass(Rank rank){super(rank);};\r
                public TaxonNameBaseTestClass(HomotypicalGroup hg){super(hg);};\r
                public TaxonNameBaseTestClass(Rank rank, HomotypicalGroup hg){super(rank, hg);};\r
+               @Override\r
                public boolean isCodeCompliant(){return false;};\r
+               @Override\r
                public void setCacheStrategy(INameCacheStrategy strategy){};\r
+               @Override\r
                public INameCacheStrategy getCacheStrategy(){return null;};\r
+               @Override\r
                public NomenclaturalCode getNomenclaturalCode(){return null;};\r
        }\r
 \r
index 3485af1d231ac05e0ac176a55cc0c2aa7b242e0f..35b0384b60d9f91817ff8febb4cbf49aebee7d90 100644 (file)
@@ -9,8 +9,6 @@
 \r
 package eu.etaxonomy.cdm.model.taxon;\r
 \r
-import static org.junit.Assert.*;\r
-\r
 import java.util.ArrayList;\r
 import java.util.Calendar;\r
 import java.util.Collections;\r
index 7cae4207d369a6a11e0c476febd09d66c5bfff74..6d1b8fb695131c945846137e45c96f3c054ea22a 100644 (file)
@@ -12,8 +12,6 @@ package eu.etaxonomy.cdm.test.function;
 import java.util.Calendar;\r
 import java.util.Set;\r
 \r
-import javax.activation.MimeType;\r
-\r
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.model.agent.Agent;\r