delete warnings in IO

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelIOBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelIOBase.java
index 2e7d57f524d8cabb549968cf5d435486aaa8e5af..80c30d142aa45c4f9a034a1accbc3922ebe64937 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelIOBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelIOBase.java
@@ -17,6 +17,7 @@ import eu.etaxonomy.cdm.model.common.Language;
 \r
 \r
 public abstract class BerlinModelIOBase extends CdmIoBase implements ICdmIO {\r
+       @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(BerlinModelIOBase.class);\r
        \r
        public BerlinModelIOBase() {\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelNameFactsIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelNameFactsIO.java
index 7cea728f1305ec77482791a82475c46bb3208243..34d623a81ca4da45ff27be566d580774b590671e 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelNameFactsIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelNameFactsIO.java
@@ -17,7 +17,6 @@ import java.util.Set;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
 import eu.etaxonomy.cdm.api.service.INameService;\r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.common.MediaMetaData.ImageMetaData;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelNameStatusIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelNameStatusIO.java
index d892ebbdbadbf3e122e116ea3465730b8a3c2261..2b210ac1955c9f95a8a76bdbb79b6118c7e79201 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelNameStatusIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelNameStatusIO.java
@@ -28,7 +28,6 @@ import java.util.Set;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
 import eu.etaxonomy.cdm.api.service.INameService;\r
 import eu.etaxonomy.cdm.io.common.ICdmIO;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelOccurrenceIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelOccurrenceIO.java
index 1d911e0fdb98b32b52d03be82b235bf395984022..ca6145cecfb4e241f3153cd860a5b39f645c7388 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelOccurrenceIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelOccurrenceIO.java
@@ -10,8 +10,7 @@ import java.util.Map;
 import java.util.Set;\r
 \r
 import org.apache.log4j.Logger;\r
-import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.*;\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+\r
 import eu.etaxonomy.cdm.api.service.ITaxonService;\r
 import eu.etaxonomy.cdm.io.common.ICdmIO;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
@@ -21,8 +20,6 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
-import eu.etaxonomy.cdm.model.description.TextData;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelReferenceIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelReferenceIO.java
index b91e730826f3ebc50a84514949a364aaf2f4d9b1..077e703d6f5b36181ac064b49b397e224529de5b 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelReferenceIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelReferenceIO.java
@@ -25,6 +25,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;\r
 import java.util.ArrayList;\r
 import java.util.Arrays;\r
+import java.util.Collection;\r
 import java.util.HashMap;\r
 import java.util.HashSet;\r
 import java.util.Iterator;\r
@@ -264,7 +265,8 @@ public class BerlinModelReferenceIO extends BerlinModelIOBase {
                        }\r
                        //save and store in map\r
                        logger.info("Save nomenclatural preliminary references (" + refCounter.nomRefCount + ")");\r
-                       referenceService.saveReferenceAll(nomRefDetailMap.objects());\r
+                       Collection<ReferenceBase> col = nomRefDetailMap.objects();\r
+                       referenceService.saveReferenceAll(col);\r
                        logger.info("Save bibliographical preliminary references (" + refCounter.referenceCount +")");\r
                        referenceService.saveReferenceAll(refDetailMap.objects());\r
                        \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonIO.java
index 1b232e0671c2f77ba8068ddbf82dba3b135bbd3f..8f7ce29e4b1c1fb2f626f8e861898515bb758981 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonIO.java
@@ -117,8 +117,6 @@ public class BerlinModelTaxonIO  extends BerlinModelIOBase  {
                \r
                BerlinModelImportConfigurator bmiConfig = (BerlinModelImportConfigurator)config;\r
                Source source = bmiConfig.getSource();\r
-               String dbAttrName;\r
-               String cdmAttrName;\r
                \r
                logger.info("start makeTaxa ...");\r
                \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameIO.java
index 1b45fffb2898ac7279999e159bf9d5cb66fbeb6e..e3a674b8201671d846a4127e03b37feb3bf9f651 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameIO.java
@@ -115,7 +115,7 @@ public class BerlinModelTaxonNameIO extends BerlinModelIOBase {
                                        boolean useUnknownRank = true;\r
                                        Rank rank = BerlinModelTransformer.rankId2Rank(rs, useUnknownRank);\r
                                        \r
-                                       TaxonNameBase taxonNameBase;\r
+                                       TaxonNameBase<?,?> taxonNameBase;\r
                                        if (bmiConfig.getNomenclaturalCode() != null){\r
                                                taxonNameBase = bmiConfig.getNomenclaturalCode().getNewTaxonNameInstance(rank);\r
                                        }else{\r
@@ -173,7 +173,7 @@ public class BerlinModelTaxonNameIO extends BerlinModelIOBase {
 \r
                                        //NonViralName\r
                                        if (taxonNameBase instanceof NonViralName){\r
-                                               NonViralName nonViralName = (NonViralName)taxonNameBase;\r
+                                               NonViralName<?> nonViralName = (NonViralName<?>)taxonNameBase;\r
                                                \r
                                                //authorTeams\r
                                                if (authorMap != null ){\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameRelationIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameRelationIO.java
index 5d0b0468cc1864627decb0b698cdab4726fa8321..c19d08ba11b25acbb8b9f31c2164612cdef890b7 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameRelationIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameRelationIO.java
@@ -73,8 +73,6 @@ public class BerlinModelTaxonNameRelationIO extends BerlinModelIOBase {
                Set<TaxonNameBase> nameStore = new HashSet<TaxonNameBase>();\r
                BerlinModelImportConfigurator bmiConfig = (BerlinModelImportConfigurator)config;\r
                Source source = bmiConfig.getSource();\r
-               String dbAttrName;\r
-               String cdmAttrName;\r
                \r
                logger.info("start makeNameRelationships ...");\r
                \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonRelationIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonRelationIO.java
index a04802b598768298c7a92098d24c974cd742c943..3db02cce7da05e408d2eb78cde51e83f9de7c658 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonRelationIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonRelationIO.java
@@ -138,8 +138,6 @@ public class BerlinModelTaxonRelationIO  extends BerlinModelIOBase  {
                Set<TaxonBase> taxonStore = new HashSet<TaxonBase>();\r
                BerlinModelImportConfigurator bmiConfig = (BerlinModelImportConfigurator)config;\r
                Source source = bmiConfig.getSource();\r
-               String dbAttrName;\r
-               String cdmAttrName;\r
                \r
                logger.info("start makeTaxonRelationships ...");\r
                \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTypesIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTypesIO.java
index 09cf4d788c06849dbf630abfc8b52aefb8c5c0d4..5ab69122a78d94dbb22363c1f6645bfa780cb033 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTypesIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTypesIO.java
@@ -77,8 +77,6 @@ public class BerlinModelTypesIO extends BerlinModelIOBase /*implements IIO<Berli
                INameService nameService = config.getCdmAppController().getNameService();\r
                \r
                Map<Integer, Specimen> typeMap = new HashMap<Integer, Specimen>();\r
-               String dbAttrName;\r
-               String cdmAttrName;\r
                \r
                logger.info("start makeTypes ...");\r
                \r
@@ -115,7 +113,7 @@ public class BerlinModelTypesIO extends BerlinModelIOBase /*implements IIO<Berli
                                //PublishFlag xxx\r
                                \r
                                \r
-                               TaxonNameBase taxonNameBase = taxonNameMap.get(nameId);\r
+                               TaxonNameBase<?,?> taxonNameBase = taxonNameMap.get(nameId);\r
                                \r
                                if (taxonNameBase != null){\r
                                        try{\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/SourceConnectionException.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/SourceConnectionException.java
index 9fe62d5e8a2ede0112fe1d9fd7042048f4ef5b69..d9e5805d136eaa8e4ce83c2ecc69b25c6c8ad569 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/SourceConnectionException.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/SourceConnectionException.java
@@ -1,6 +1,7 @@
 package eu.etaxonomy.cdm.io.common;\r
 \r
 public class SourceConnectionException extends Exception {\r
+       private static final long serialVersionUID = -3846939002083939654L;\r
 \r
        public SourceConnectionException() {\r
                super();\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmExporter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmExporter.java
index 65792fac90db2fd010ce21b1ad96b2d3fae8353c..a13e8af4b038361c41b955d9d6eb5d2990d38a6b 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmExporter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmExporter.java
@@ -6,74 +6,29 @@
 \r
 package eu.etaxonomy.cdm.io.jaxb;\r
 \r
-import java.io.File;\r
 import java.io.FileOutputStream;\r
-import java.io.FileWriter;\r
 import java.io.OutputStreamWriter;\r
 import java.io.PrintWriter;\r
-import java.io.Writer;\r
-import java.util.ArrayList;\r
-import java.util.Collection;\r
-import java.util.GregorianCalendar;\r
 import java.util.HashSet;\r
 import java.util.List;\r
-import java.util.Map;\r
 import java.util.Set;\r
 \r
 import org.apache.log4j.Logger;\r
-import org.springframework.test.context.ContextConfiguration;\r
 import org.springframework.transaction.TransactionStatus;\r
-import org.unitils.database.annotations.TestDataSource;\r
-import org.unitils.database.annotations.Transactional;\r
-import org.unitils.database.util.TransactionMode;\r
-import org.unitils.spring.annotation.SpringApplicationContext;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
-import eu.etaxonomy.cdm.common.AccountStore;\r
-import eu.etaxonomy.cdm.database.CdmDataSource;\r
-import eu.etaxonomy.cdm.database.DataSourceNotFoundException;\r
-import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
-import eu.etaxonomy.cdm.database.ICdmDataSource;\r
-import eu.etaxonomy.cdm.io.common.CdmIoBase;\r
-import eu.etaxonomy.cdm.io.common.ICdmIO;\r
 import eu.etaxonomy.cdm.io.common.ICdmIoExport;\r
 import eu.etaxonomy.cdm.io.common.IExportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
-import eu.etaxonomy.cdm.io.common.MapWrapper;\r
 import eu.etaxonomy.cdm.model.agent.Agent;\r
-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.common.AnnotatableEntity;\r
-import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
-import eu.etaxonomy.cdm.model.common.Keyword;\r
-import eu.etaxonomy.cdm.model.common.LanguageStringBase;\r
-import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
 import eu.etaxonomy.cdm.model.common.RelationshipBase;\r
-import eu.etaxonomy.cdm.model.common.Representation;\r
-import eu.etaxonomy.cdm.model.common.TermBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
-import eu.etaxonomy.cdm.model.common.TimePeriod;\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-import eu.etaxonomy.cdm.model.common.init.TermNotFoundException;\r
-import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
-import eu.etaxonomy.cdm.model.name.BotanicalName;\r
-import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
-import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
-import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\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
-import eu.etaxonomy.cdm.model.reference.StrictReferenceBase;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
-import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;\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
 \r
 /**\r
  * @author a.babadshanjan\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/synthesys/SpecimenIoBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/synthesys/SpecimenIoBase.java
index 67ca4f1670cd1d8e75ba4cc2e7e6370d1cd13f63..2d66caf4d10ae54927d68d918754d2c26c7ab009 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/synthesys/SpecimenIoBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/synthesys/SpecimenIoBase.java
@@ -5,13 +5,13 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;
 import eu.etaxonomy.cdm.io.common.CdmIoBase;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;
 import eu.etaxonomy.cdm.io.common.MapWrapper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 
 public class SpecimenIoBase  extends CdmIoBase {
+       @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(SpecimenIoBase.class);
 
        @Override

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/DefaultTcsXmlPlaceholders.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/DefaultTcsXmlPlaceholders.java
index 185ae5c7fbd4f280a2cf31688554d7215aef6264..c0fc776150ea3d1aa603bc27c24a91fd62cca625 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/DefaultTcsXmlPlaceholders.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/DefaultTcsXmlPlaceholders.java
@@ -9,8 +9,6 @@
 \r
 package eu.etaxonomy.cdm.io.tcsxml;\r
 \r
-import java.util.List;\r
-\r
 import org.apache.log4j.Logger;\r
 import org.jdom.Element;\r
 \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/ITcsXmlPlaceholderClass.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/ITcsXmlPlaceholderClass.java
index 18524c2ad99566084dac74635881940f1b7e5dc3..a28c06f56913d5546687f041d53f9c980a6ceb73 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/ITcsXmlPlaceholderClass.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/ITcsXmlPlaceholderClass.java
@@ -4,8 +4,6 @@ import org.jdom.Element;
 \r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 \r
-import org.apache.log4j.Logger;\r
-\r
 public interface ITcsXmlPlaceholderClass {\r
 \r
        public abstract boolean makeMetaDataDetailed(\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlImportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlImportConfigurator.java
index 447533965cf3552e46c56c46fda1ec1be79b40e0..8c01932344cbe58fb56c8c7a5484a9015b1f63eb 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlImportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlImportConfigurator.java
@@ -99,10 +99,6 @@ public class TcsXmlImportConfigurator extends ImportConfiguratorBase implements
        }\r
        \r
        private boolean makeNamespaces(Element root){\r
-               //String strTnNamespace = "http://rs.tdwg.org/ontology/voc/TaxonName#";\r
-               //Namespace taxonNameNamespace = Namespace.getNamespace("tn", strTnNamespace);\r
-\r
-               String prefix;\r
                tcsXmlNamespace = root.getNamespace();\r
                if (tcsXmlNamespace == null \r
                                /**|| tcNamespace == null \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlIoBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlIoBase.java
index 456f18340d4e528efb38d8ab9370a28c7b3826d5..490ce371bc13737dc32af42fae3d69eb1d4185df 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlIoBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlIoBase.java
@@ -12,9 +12,6 @@ package eu.etaxonomy.cdm.io.tcsxml;
 import static eu.etaxonomy.cdm.io.common.ImportHelper.OBLIGATORY;\r
 import static eu.etaxonomy.cdm.io.common.ImportHelper.OVERWRITE;\r
 \r
-import java.lang.reflect.Constructor;\r
-import java.lang.reflect.InvocationTargetException;\r
-import java.lang.reflect.Method;\r
 import java.util.ArrayList;\r
 import java.util.Arrays;\r
 import java.util.HashSet;\r
@@ -27,7 +24,6 @@ import org.jdom.Element;
 import org.jdom.Namespace;\r
 import org.jdom.Text;\r
 \r
-\r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.common.ResultWrapper;\r
 import eu.etaxonomy.cdm.common.XmlHelp;\r
@@ -38,10 +34,8 @@ import eu.etaxonomy.cdm.io.tcs.CdmIoXmlMapperBase;
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
-import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.reference.Generic;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 \r
 /**\r
  * @author a.mueller\r
@@ -103,7 +97,6 @@ public abstract class TcsXmlIoBase  extends CdmIoBase {
                for(Content content: contentList){\r
                        boolean contentExists = false;\r
                        if (content instanceof Element){\r
-                               Element elementContent = (Element)content;\r
                                for (CdmIoXmlMapperBase mapper : mapperList){\r
                                        if (mapper.mapsSource(content, parentElement)){\r
                                                contentExists = true;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlSpecimensIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlSpecimensIO.java
index 54ab52721c827dc93567c784f3a06cce26176998..ab3bada1c71bf59f8f3fda7a8975ce1a4b9138bf 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlSpecimensIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlSpecimensIO.java
@@ -3,45 +3,23 @@
  */\r
 package eu.etaxonomy.cdm.io.tcsxml;\r
 \r
-import static eu.etaxonomy.cdm.io.common.ImportHelper.OBLIGATORY;\r
-import static eu.etaxonomy.cdm.io.common.ImportHelper.OVERWRITE;\r
-\r
-import java.lang.reflect.InvocationTargetException;\r
-import java.util.Arrays;\r
-import java.util.HashSet;\r
 import java.util.List;\r
 import java.util.Map;\r
-import java.util.Set;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.jdom.Element;\r
 import org.jdom.Namespace;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;\r
-import eu.etaxonomy.cdm.api.service.IReferenceService;\r
-import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.common.DoubleResult;\r
 import eu.etaxonomy.cdm.common.XmlHelp;\r
 import eu.etaxonomy.cdm.io.common.ICdmIO;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
-import eu.etaxonomy.cdm.io.common.ImportHelper;\r
 import eu.etaxonomy.cdm.io.common.MapWrapper;\r
 import eu.etaxonomy.cdm.model.agent.Institution;\r
-import eu.etaxonomy.cdm.model.agent.Team;\r
-import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.occurrence.Collection;\r
 import eu.etaxonomy.cdm.model.occurrence.Specimen;\r
-import eu.etaxonomy.cdm.model.reference.Article;\r
-import eu.etaxonomy.cdm.model.reference.Book;\r
-import eu.etaxonomy.cdm.model.reference.BookSection;\r
-import eu.etaxonomy.cdm.model.reference.Generic;\r
-import eu.etaxonomy.cdm.model.reference.Journal;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
-import eu.etaxonomy.cdm.model.reference.StrictReferenceBase;\r
-import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonIO.java
index b529f91ac4c0b68e1ba5e13cc7174fd8a936891d..b42bd1b76ea1e3a9f3da64c724a4869886ad6a90 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonIO.java
@@ -18,21 +18,18 @@ import org.jdom.filter.ElementFilter;
 import org.jdom.filter.Filter;\r
 \r
 import eu.etaxonomy.cdm.api.service.ITaxonService;\r
-import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.common.ResultWrapper;\r
 import eu.etaxonomy.cdm.common.XmlHelp;\r
 import eu.etaxonomy.cdm.io.common.ICdmIO;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.ImportHelper;\r
 import eu.etaxonomy.cdm.io.common.MapWrapper;\r
-import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\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.reference.Generic;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonNameIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonNameIO.java
index 70d3b83051da786013a00c80f34d6a2e99b8f33e..9e7b8fdfe6fdc78af7edc501b7f7299d61210851 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonNameIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonNameIO.java
@@ -176,7 +176,7 @@ public class TcsXmlTaxonNameIO extends TcsXmlIoBase implements ICdmIO {
                        }\r
                }\r
                logger.info(i + " names handled");\r
-               Collection col = taxonNameMap.objects();\r
+               Collection<? extends TaxonNameBase<?,?>> col = taxonNameMap.objects();\r
                nameService.saveTaxonNameAll(col);\r
 \r
                logger.info("end makeTaxonNames ...");\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonRelationsIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonRelationsIO.java
index 45c53935cf84cff4a08b1529461af9178cad3bda..face59518b9c6ce3a8fb6eff61c1508ec4d264d4 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonRelationsIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonRelationsIO.java
@@ -9,7 +9,6 @@ import java.util.Map;
 import java.util.Set;\r
 \r
 import org.apache.log4j.Logger;\r
-import org.hibernate.cfg.annotations.ResultsetMappingSecondPass;\r
 import org.jdom.Element;\r
 import org.jdom.Namespace;\r
 \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTransformer.java
index 8c702688305f33881626378f6a52e8b184d0b517..16cee45d44d82ea1a866b20a68cdad6f618dd10f 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTransformer.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTransformer.java
@@ -3,9 +3,7 @@ package eu.etaxonomy.cdm.io.tcsxml;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.common.ResultWrapper;\r
-import eu.etaxonomy.cdm.model.common.RelationshipBase;\r
 import eu.etaxonomy.cdm.model.common.RelationshipTermBase;\r
-import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
@@ -16,15 +14,14 @@ import eu.etaxonomy.cdm.model.reference.BookSection;
 import eu.etaxonomy.cdm.model.reference.Journal;\r
 import eu.etaxonomy.cdm.model.reference.PersonalCommunication;\r
 import eu.etaxonomy.cdm.model.reference.PrintSeries;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.model.reference.StrictReferenceBase;\r
 import eu.etaxonomy.cdm.model.reference.WebPage;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
 \r
 public final class TcsXmlTransformer {\r
+       @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(TcsXmlTransformer.class);\r
  \r
 \r

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/test/function/TestDatabase.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/test/function/TestDatabase.java
index 43e2df4905419824003312212ddc826412362159..b3d22e4cdb559b558b8734697446b0f938d74720 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/test/function/TestDatabase.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/test/function/TestDatabase.java
@@ -137,8 +137,7 @@ public class TestDatabase {
 \r
                //Contact contact1 = new Contact();\r
                //contact1.setEmail("someone@somewhere.org");\r
-               InstitutionalMembership membership \r
-               = new InstitutionalMembership(institute, linne, period, "Biodiversity", "Head");\r
+               InstitutionalMembership membership = new InstitutionalMembership(institute, linne, period, "Biodiversity", "Head");\r
                //agentData.add(contact1);\r
 \r
                agentData.add(membership);\r

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java
index 38c3b0ff10a4235d446c3742def850837d6f5d4a..049436b75c3d247783fca6a51e208e236f15b0ae 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java
@@ -6,27 +6,15 @@
 \r
 package eu.etaxonomy.cdm.test.integration;\r
 \r
-import java.io.File;\r
 import java.sql.ResultSet;\r
 import java.sql.SQLException;\r
 import java.util.ArrayList;\r
-import java.util.Arrays;\r
-import java.util.Collections;\r
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
 \r
 import org.apache.log4j.Logger;\r
-import org.hibernate.Query;\r
-import org.hibernate.Session;\r
-import org.hibernate.SessionFactory;\r
-import org.springframework.beans.factory.annotation.Autowired;\r
-import org.springframework.beans.factory.annotation.Qualifier;\r
-import org.springframework.stereotype.Component;\r
-import org.springframework.stereotype.Repository;\r
-import org.springframework.stereotype.Service;\r
 import org.springframework.transaction.TransactionStatus;\r
-import org.springframework.transaction.annotation.Transactional;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
 import eu.etaxonomy.cdm.common.AccountStore;\r
@@ -34,37 +22,18 @@ import eu.etaxonomy.cdm.database.CdmDataSource;
 import eu.etaxonomy.cdm.database.DataSourceNotFoundException;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
-import eu.etaxonomy.cdm.io.berlinModel.BerlinModelImportConfigurator;\r
-import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.Source;\r
-import eu.etaxonomy.cdm.io.jaxb.DataSet;\r
-import eu.etaxonomy.cdm.io.jaxb.CdmExporter;\r
 import eu.etaxonomy.cdm.model.agent.Agent;\r
-import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.LanguageString;\r
-import eu.etaxonomy.cdm.model.common.Marker;\r
-import eu.etaxonomy.cdm.model.common.OriginalSource;\r
 import eu.etaxonomy.cdm.model.common.Representation;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.init.TermNotFoundException;\r
-import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
-import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
-import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
-import eu.etaxonomy.cdm.model.name.NameRelationship;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
-import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;\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.persistence.dao.common.ICdmEntityDao;\r
-import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;\r
-import eu.etaxonomy.cdm.persistence.dao.media.IMediaDao;\r
 \r
 /**\r
  * @author a.babadshanjan\r