Cleanup comments

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportConfiguratorBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportConfiguratorBase.java
index a47aa6d58c189e8cf7fd88d23c4fe8cf4f9207ca..167ce45649fcd1f804625ccb369692b732acc276 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportConfiguratorBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportConfiguratorBase.java
@@ -41,41 +41,12 @@ public abstract class ImportConfiguratorBase extends IoConfiguratorBase {
        \r
        //TODO\r
        private boolean deleteAll = false;\r
-       \r
-//     private boolean doAuthors = true;\r
-//     //references\r
-//     private DO_REFERENCES doReferences = DO_REFERENCES.ALL;\r
-//     //names\r
-//     private boolean doTaxonNames = true;\r
-//     private boolean doRelNames = true;\r
-//     private boolean doNameStatus = true;\r
-//     private boolean doTypes = true;\r
-//     private boolean doNameFacts = true;\r
-//     \r
-//     //taxa\r
-//     private boolean doTaxa = true;\r
-//     private boolean doRelTaxa = true;\r
-//     private boolean doFacts = true;\r
-//\r
-//     //occurrence\r
-//     private boolean doOccurrence = true;\r
-       \r
-       /* For Jaxb import - is defined in JaxbImportConfigurator */\r
-//     private boolean doTerms = true;\r
-//     private boolean doTermVocabularies = true;\r
-//     private boolean doHomotypicalGroups = true;\r
-//     private boolean doReferencedEntities = true;\r
-//     private boolean doFeatureData = true;\r
-//     private boolean doMedia = true;\r
-//     private boolean doLanguageData = true;\r
-       /* end for Jaxb import */\r
-       \r
+               \r
        //nullValues\r
        private boolean ignoreNull = false;\r
        \r
        //Nomenclatural Code\r
        private NomenclaturalCode nomenclaturalCode = null;\r
-//     protected Class<ICdmIO>[] ioClassList; \r
        \r
        private MapWrapper<Feature> featureMap = new MapWrapper<Feature>(null);\r
        \r
@@ -152,28 +123,6 @@ public abstract class ImportConfiguratorBase extends IoConfiguratorBase {
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#isDoAuthors()\r
         */\r
-//     public boolean isDoAuthors() {\r
-//             return doAuthors;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#setDoAuthors(boolean)\r
-//      */\r
-//     public void setDoAuthors(boolean doAuthors) {\r
-//             this.doAuthors = doAuthors;\r
-//     }\r
-//     \r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#getDoReferences()\r
-//      */\r
-//     public DO_REFERENCES getDoReferences() {\r
-//             return doReferences;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#setDoReferences(eu.etaxonomy.cdm.io.tcs.TcsImportConfigurator.DO_REFERENCES)\r
-//      */\r
-//     public void setDoReferences(DO_REFERENCES doReferences) {\r
-//             this.doReferences = doReferences;\r
-//     }\r
        \r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#getCheck()\r
@@ -190,180 +139,6 @@ public abstract class ImportConfiguratorBase extends IoConfiguratorBase {
        }\r
        \r
        \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#isDoTaxonNames()\r
-        */\r
-//     public boolean isDoTaxonNames() {\r
-//             return doTaxonNames;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#setDoTaxonNames(boolean)\r
-//      */\r
-//     public void setDoTaxonNames(boolean doTaxonNames) {\r
-//             this.doTaxonNames = doTaxonNames;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#isDoRelNames()\r
-//      */\r
-//     public boolean isDoRelNames() {\r
-//             return doRelNames;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#setDoRelNames(boolean)\r
-//      */\r
-//     public void setDoRelNames(boolean doRelNames) {\r
-//             this.doRelNames = doRelNames;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#isDoNameStatus()\r
-//      */\r
-//     public boolean isDoNameStatus() {\r
-//             return doNameStatus;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#setDoNameStatus(boolean)\r
-//      */\r
-//     public void setDoNameStatus(boolean doNameStatus) {\r
-//             this.doNameStatus = doNameStatus;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#isDoNameFacts()\r
-//      */\r
-//     public boolean isDoNameFacts() {\r
-//             return doNameFacts;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#setDoNameFacts(boolean)\r
-//      */\r
-//     public void setDoNameFacts(boolean doNameFacts) {\r
-//             this.doNameFacts = doNameFacts;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#isDoTypes()\r
-//      */\r
-//     public boolean isDoTypes() {\r
-//             return doTypes;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#setDoTypes(boolean)\r
-//      */\r
-//     public void setDoTypes(boolean doTypes) {\r
-//             this.doTypes = doTypes;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#isDoTaxa()\r
-//      */\r
-//     public boolean isDoTaxa() {\r
-//             return doTaxa;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#setDoTaxa(boolean)\r
-//      */\r
-//     public void setDoTaxa(boolean doTaxa) {\r
-//             this.doTaxa = doTaxa;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#isDoRelTaxa()\r
-//      */\r
-//     public boolean isDoRelTaxa() {\r
-//             return doRelTaxa;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#setDoRelTaxa(boolean)\r
-//      */\r
-//     public void setDoRelTaxa(boolean doRelTaxa) {\r
-//             this.doRelTaxa = doRelTaxa;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#isDoFacts()\r
-//      */\r
-//     public boolean isDoFacts() {\r
-//             return doFacts;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#setDoFacts(boolean)\r
-//      */\r
-//     public void setDoFacts(boolean doFacts) {\r
-//             this.doFacts = doFacts;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#isDoOccurrence()\r
-//      */\r
-//     public boolean isDoOccurrence() {\r
-//             return doOccurrence;\r
-//     }\r
-//     /* (non-Javadoc)\r
-//      * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#setDoOccurrence(boolean)\r
-//      */\r
-//     public void setDoOccurrence(boolean doOccurrence) {\r
-//             this.doOccurrence = doOccurrence;\r
-//     }\r
-       \r
-       /* \r
-        * For Jaxb Import\r
-        * TODO: Cleanup\r
-        */\r
-       \r
-//     public boolean isDoTerms() {\r
-//             return doTerms;\r
-//     }\r
-//     \r
-//     public void setDoTerms(boolean doTerms) {\r
-//             this.doTerms = doTerms;\r
-//     }\r
-//     \r
-//     public boolean isDoTermVocabularies() {\r
-//             return doTermVocabularies;\r
-//     }\r
-//     \r
-//     public void setDoTermVocabularies(boolean doTermVocabularies) {\r
-//             this.doTermVocabularies = doTermVocabularies;\r
-//     }\r
-//     \r
-//     public boolean isDoHomotypicalGroups() {\r
-//             return doHomotypicalGroups;\r
-//     }\r
-//     \r
-//     public void setDoHomotypicalGroups(boolean doHomotypicalGroups) {\r
-//             this.doHomotypicalGroups = doHomotypicalGroups;         \r
-//     }\r
-//     \r
-//     public boolean isDoReferencedEntities() {\r
-//             return doReferencedEntities;\r
-//     }\r
-//     \r
-//     public void setDoReferencedEntities(boolean doReferencedEntities) {\r
-//             this.doReferencedEntities = doReferencedEntities;               \r
-//     }\r
-//     \r
-//     public boolean isDoFeatureData() {\r
-//             return doFeatureData;\r
-//     }\r
-//     \r
-//     public void setDoFeatureData(boolean doFeatureData) {\r
-//             this.doFeatureData = doFeatureData;             \r
-//     }\r
-//     \r
-//     public boolean isDoMedia() {\r
-//             return doMedia;\r
-//     }\r
-//     \r
-//     public void setDoMedia(boolean doMedia) {\r
-//             this.doMedia = doMedia;         \r
-//     }\r
-//     \r
-//     public boolean isDoLanguageData() {\r
-//             return doLanguageData;\r
-//     }\r
-//     \r
-//     public void setDoLanguageData(boolean doLanguageData) {\r
-//             this.doLanguageData = doLanguageData;           \r
-//     }\r
-\r
-       /*\r
-        * end for Jaxb import\r
-        */\r
-       \r
        /**\r
         * If true, no errors occurs if objects are not found that should exist. This may\r
         * be needed e.g. when only subsets of the data are imported.\r
@@ -394,18 +169,6 @@ public abstract class ImportConfiguratorBase extends IoConfiguratorBase {
                this.destination = destination;\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#getDbSchemaValidation()\r
-        */\r
-//     public DbSchemaValidation getDbSchemaValidation() {\r
-//             return dbSchemaValidation;\r
-//     }\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#setDbSchemaValidation(eu.etaxonomy.cdm.database.DbSchemaValidation)\r
-        */\r
-//     public void setDbSchemaValidation(DbSchemaValidation dbSchemaValidation) {\r
-//             this.dbSchemaValidation = dbSchemaValidation;\r
-//     }\r
 \r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.io.tcs.IImportConfigurator#getSourceReference()\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/distribution/DistributionImporter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/distribution/DistributionImporter.java
index 521554935830dc038657952d7bdf8276ec68f271..ce4075595efa027b9bff5ef26eab32f0608c77a0 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/distribution/DistributionImporter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/distribution/DistributionImporter.java
@@ -81,7 +81,6 @@ public class DistributionImporter extends CdmIoBase implements ICdmIO {
                for (int i = 0; i < recordList.size(); i++) {\r
                        record = recordList.get(i);\r
                        analyzeRecord(config.getDestination(), record);\r
-//                     config.setDbSchemaValidation(DbSchemaValidation.UPDATE);\r
                }\r
                appCtr.commitTransaction(txStatus);\r
        }\r
@@ -156,20 +155,12 @@ public class DistributionImporter extends CdmIoBase implements ICdmIO {
     private void saveRecord(String taxonName, ArrayList<String> distributionList,\r
                String status, String literatureNumber, String literature) {\r
 \r
-               //TransactionStatus txStatus = appCtr.startTransaction();\r
-\r
-               // Stores already processed descriptions\r
-//     myDescriptions = new HashMap<Taxon, TaxonDescription>();\r
-               // Stores already processed distributions\r
-//     Map<Taxon, Distribution> myDistributions = new HashMap<Taxon, Distribution>();\r
-\r
                try {\r
                // get the matching names from the DB\r
                List<TaxonNameBase<?,?>> taxonNameBases = appCtr.getNameService().findNamesByTitle(taxonName);\r
                if (taxonNameBases.isEmpty()) {\r
                        logger.error("Taxon name '" + taxonName + "' not found in DB");\r
                } else {\r
-//                     logger.debug("Taxon found: '" + taxonName + "'");\r
                        logger.debug("Taxon found");\r
                }\r
 \r
@@ -219,7 +210,6 @@ public class DistributionImporter extends CdmIoBase implements ICdmIO {
                                        if(!distribution.equals("")) {\r
                                                NamedArea namedArea = TdwgArea.getAreaByTdwgAbbreviation(distribution);\r
                                                TaxonDescription taxonDescription = myDescriptions.get(taxon);\r
-                                               //taxonDescription = taxon.getDescriptions()\r
                                                if (namedArea != null) {    \r
                                                // Check against existing distributions and ignore the ones that occur multiple times\r
                                                Set<DescriptionElementBase> myDescriptionElements = taxonDescription.getElements();\r
@@ -238,21 +228,16 @@ public class DistributionImporter extends CdmIoBase implements ICdmIO {
                                                        Distribution newDistribution = Distribution.NewInstance(namedArea, presenceAbsenceStatus);\r
                                                        myDescription.addElement(newDistribution);\r
                                                        logger.debug("Distribution created: " + newDistribution.toString());\r
-//                                                     myDescriptions.put(taxon, myDescription);\r
                                                }\r
                                                }\r
                                        }\r
                                }\r
-//                             appCtr.getDescriptionService().saveDescription(myDescription);\r
                                if (save == true) {\r
-//                                     myDescriptions.put(taxon, myDescription);\r
                                        appCtr.getTaxonService().saveTaxon(taxon);\r
                                        logger.debug("Taxon saved");\r
                                }\r
                        }\r
                } \r
-//             appCtr.commitTransaction(txStatus);\r
-               \r
        } catch (Exception e) {\r
                logger.error("Error");\r
                e.printStackTrace();\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExportConfigurator.java
index 1f58c337927c20c3d9ae0598b1022da0253842e9..5421ae8b6645c4b31a10fd589e483e9a8aa94ed4 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExportConfigurator.java
@@ -43,59 +43,7 @@ public class JaxbExportConfigurator extends ExportConfiguratorBase implements IE
        private boolean doTermVocabularies = true;\r
        private boolean doHomotypicalGroups = true;\r
        \r
-//     private Object source;\r
-//     private ICdmDataSource cdmDb;\r
-//     private ICdmDataSource cdmSource;\r
-//     private ICdmDataSource cdmDestination;\r
-//     private DbSchemaValidation cdmSourceSchemaValidation = DbSchemaValidation.VALIDATE;\r
-//     private DbSchemaValidation cdmDestSchemaValidation = DbSchemaValidation.CREATE;\r
-//     private CdmApplicationController cdmApp = null;\r
-\r
        \r
-       /**\r
-        * Returns a <code>CdmApplicationController</code> created by the values of this configuration.\r
-        * If create new is true always a new controller is returned, else the last created controller is returned. If no controller has\r
-        * been created before a new controller is returned.\r
-        * @return\r
-        */\r
-//     public CdmApplicationController getSourceAppController(ICdmDataSource cdmDb, boolean createNew){\r
-//             if (cdmApp == null || createNew == true){\r
-//                     try {\r
-//                             cdmApp = CdmApplicationController.NewInstance(this.getCdmSource(), this.getCdmSourceSchemaValidation(), true);\r
-//                     } catch (DataSourceNotFoundException e) {\r
-//                             logger.error("Could not connect to source database");\r
-//                             return null;\r
-//                     }catch (TermNotFoundException e) {\r
-//                             logger.error("Terms not found in source database. " +\r
-//                             "This error should not happen since preloaded terms are not expected for this application.");\r
-//                             return null;\r
-//                     }\r
-//             }\r
-//             return cdmApp;\r
-//     }\r
-\r
-       /**\r
-        * Returns a <code>CdmApplicationController</code> created by the values of this configuration.\r
-        * If create new is true always a new controller is returned, else the last created controller is returned. If no controller has\r
-        * been created before a new controller is returned.\r
-        * @return\r
-        */\r
-//     public CdmApplicationController getDestinationAppController(ICdmDataSource cdmDb, boolean createNew){\r
-//             if (cdmApp == null || createNew == true){\r
-//                     try {\r
-//                             cdmApp = CdmApplicationController.NewInstance(this.getCdmDestination(), this.getCdmDestSchemaValidation(), true);\r
-//                     } catch (DataSourceNotFoundException e) {\r
-//                             logger.error("Could not connect to destination database");\r
-//                             return null;\r
-//                     }catch (TermNotFoundException e) {\r
-//                             logger.error("Terms not found in destination database. " +\r
-//                             "This error should not happen since preloaded terms are not expected for this application.");\r
-//                             return null;\r
-//                     }\r
-//             }\r
-//             return cdmApp;\r
-//     }\r
-\r
        public int getMaxRows() {\r
                return maxRows;\r
        }\r
@@ -104,46 +52,7 @@ public class JaxbExportConfigurator extends ExportConfiguratorBase implements IE
                this.maxRows = maxRows;\r
        }\r
        \r
-//     public ICdmDataSource getCdmSource() {\r
-//             return cdmSource;\r
-//     }\r
-//     \r
-//     public void setCdmSource(ICdmDataSource cdmSource) {\r
-//             this.cdmSource = cdmSource;\r
-//     }\r
-\r
-//     public ICdmDataSource getCdmDestination() {\r
-//             return cdmDestination;\r
-//     }\r
-//\r
-//     public void setCdmDestination(ICdmDataSource cdmDestination) {\r
-//             this.cdmDestination = cdmDestination;\r
-//     }\r
-\r
-//     public DbSchemaValidation getCdmSourceSchemaValidation() {\r
-//             return cdmSourceSchemaValidation;\r
-//     }\r
-//\r
-//     public void setCdmSourceSchemaValidation(DbSchemaValidation cdmSchemaValidation) {\r
-//             this.cdmSourceSchemaValidation = cdmSchemaValidation;\r
-//     }\r
 \r
-//     public DbSchemaValidation getCdmDestSchemaValidation() {\r
-//             return cdmDestSchemaValidation;\r
-//     }\r
-//\r
-//     public void setCdmDestSchemaValidation(DbSchemaValidation cdmSchemaValidation) {\r
-//             this.cdmDestSchemaValidation = cdmSchemaValidation;\r
-//     }\r
-\r
-//     public boolean isDoAgents() {\r
-//             return doAgents;\r
-//     }\r
-//     \r
-//     public void setDoAgents(boolean doAgents) {\r
-//             this.doAgents = doAgents;\r
-//     }\r
-       \r
        public boolean isDoAgentData() {\r
                return doAgentData;\r
        }\r
@@ -184,22 +93,6 @@ public class JaxbExportConfigurator extends ExportConfiguratorBase implements IE
                this.doMedia = doMedia;\r
        }\r
 \r
-//     public boolean isDoOccurrences() {\r
-//             return doOccurrences;\r
-//     }\r
-//     \r
-//     public void setDoOccurrences(boolean doOccurrences) {\r
-//             this.doOccurrences = doOccurrences;\r
-//     }\r
-       \r
-//     public boolean isDoReferences() {\r
-//             return doReferences;\r
-//     }\r
-//     \r
-//     public void setDoReferences(boolean doReferences) {\r
-//             this.doReferences = doReferences;\r
-//     }\r
-\r
        public boolean isDoReferencedEntities() {\r
                return doReferencedEntities;\r
        }\r
@@ -208,13 +101,6 @@ public class JaxbExportConfigurator extends ExportConfiguratorBase implements IE
                this.doReferencedEntities = doReferencedEntities;\r
        }\r
 \r
-//     public boolean isDoRelationships() {\r
-//             return doRelationships;\r
-//     }\r
-//     \r
-//     public void setDoRelationships(boolean doRelationships) {\r
-//             this.doRelationships = doRelationships;\r
-//     }\r
 \r
        public boolean isDoSynonyms() {\r
                return doSynonyms;\r
@@ -224,21 +110,6 @@ public class JaxbExportConfigurator extends ExportConfiguratorBase implements IE
                this.doSynonyms = doSynonyms;\r
        }\r
 \r
-//     public boolean isDoTaxonNames() {\r
-//             return doTaxonNames;\r
-//     }\r
-//     \r
-//     public void setDoTaxonNames(boolean doTaxonNames) {\r
-//             this.doTaxonNames = doTaxonNames;\r
-//     }\r
-       \r
-//     public boolean isDoTaxa() {\r
-//             return doTaxa;\r
-//     }\r
-//     \r
-//     public void setDoTaxa(boolean doTaxa) {\r
-//             this.doTaxa = doTaxa;\r
-//     }\r
 \r
        public boolean isDoTerms() {\r
                return doTerms;\r
@@ -305,21 +176,6 @@ public class JaxbExportConfigurator extends ExportConfiguratorBase implements IE
        }\r
        \r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.ImportConfiguratorBase#getDestinationReference()\r
-        */\r
-//     @Override\r
-//     public ReferenceBase getDestinationReference() {\r
-//             //TODO\r
-//             if (this.destinationReference == null){\r
-//                     logger.warn("getDestinationReference() not yet fully implemented");\r
-//                     destinationReference = Database.NewInstance();\r
-//                     destinationReference.setTitleCache("Jaxb export");\r
-//             }\r
-//             return destinationReference;\r
-//     }\r
-\r
-\r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.io.common.IExportConfigurator#getDestinationNameString()\r
         */\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImportConfigurator.java
index 38f5c8376b574089e55547b96753c8dffea08cbb..e2b2a6103992f4d22f4e149845f14fcbff22e643 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImportConfigurator.java
@@ -47,58 +47,6 @@ public class JaxbImportConfigurator extends ImportConfiguratorBase implements II
        private boolean doTermVocabularies = true;\r
        private boolean doHomotypicalGroups = true;\r
 \r
-//     private Object source;\r
-//     private ICdmDataSource cdmDb;\r
-//     private ICdmDataSource cdmSource;\r
-//     private ICdmDataSource cdmDestination;\r
-//     private DbSchemaValidation cdmSourceSchemaValidation = DbSchemaValidation.VALIDATE;\r
-//     private DbSchemaValidation cdmDestSchemaValidation = DbSchemaValidation.CREATE;\r
-//     private CdmApplicationController cdmApp = null;\r
-\r
-\r
-       /**\r
-        * Returns a <code>CdmApplicationController</code> created by the values of this configuration.\r
-        * If create new is true always a new controller is returned, else the last created controller is returned. If no controller has\r
-        * been created before a new controller is returned.\r
-        * @return\r
-        */\r
-//     public CdmApplicationController getSourceAppController(ICdmDataSource cdmDb, boolean createNew){\r
-//             if (cdmApp == null || createNew == true){\r
-//                     try {\r
-//                             cdmApp = CdmApplicationController.NewInstance(this.getCdmSource(), this.getCdmSourceSchemaValidation(), true);\r
-//                     } catch (DataSourceNotFoundException e) {\r
-//                             logger.error("Could not connect to source database");\r
-//                             return null;\r
-//                     }catch (TermNotFoundException e) {\r
-//                             logger.error("Terms not found in source database. " +\r
-//                             "This error should not happen since preloaded terms are not expected for this application.");\r
-//                             return null;\r
-//                     }\r
-//             }\r
-//             return cdmApp;\r
-//     }\r
-\r
-       /**\r
-        * Returns a <code>CdmApplicationController</code> created by the values of this configuration.\r
-        * If create new is true always a new controller is returned, else the last created controller is returned. If no controller has\r
-        * been created before a new controller is returned.\r
-        * @return\r
-        */\r
-//     public CdmApplicationController getDestinationAppController(ICdmDataSource cdmDb, boolean createNew){\r
-//             if (cdmApp == null || createNew == true){\r
-//                     try {\r
-//                             cdmApp = CdmApplicationController.NewInstance(this.getCdmDestination(), this.getCdmDestSchemaValidation(), true);\r
-//                     } catch (DataSourceNotFoundException e) {\r
-//                             logger.error("Could not connect to destination database");\r
-//                             return null;\r
-//                     }catch (TermNotFoundException e) {\r
-//                             logger.error("Terms not found in destination database. " +\r
-//                             "This error should not happen since preloaded terms are not expected for this application.");\r
-//                             return null;\r
-//                     }\r
-//             }\r
-//             return cdmApp;\r
-//     }\r
 \r
        public int getMaxRows() {\r
                return maxRows;\r
@@ -108,37 +56,6 @@ public class JaxbImportConfigurator extends ImportConfiguratorBase implements II
                this.maxRows = maxRows;\r
        }\r
 \r
-//     public ICdmDataSource getCdmSource() {\r
-//             return cdmSource;\r
-//     }\r
-//\r
-//     public void setCdmSource(ICdmDataSource cdmSource) {\r
-//             this.cdmSource = cdmSource;\r
-//     }\r
-\r
-//     public ICdmDataSource getCdmDestination() {\r
-//             return super.getDestination();\r
-//     }\r
-//\r
-//     public void setCdmDestination(ICdmDataSource cdmDestination) {\r
-//             super.setDestination(cdmDestination);\r
-//     }\r
-\r
-//     public DbSchemaValidation getCdmSourceSchemaValidation() {\r
-//             return cdmSourceSchemaValidation;\r
-//     }\r
-//\r
-//     public void setCdmSourceSchemaValidation(DbSchemaValidation cdmSchemaValidation) {\r
-//             this.cdmSourceSchemaValidation = cdmSchemaValidation;\r
-//     }\r
-\r
-//     public boolean isDoAgents() {\r
-//             return doAgents;\r
-//     }\r
-//\r
-//     public void setDoAgents(boolean doAgents) {\r
-//             this.doAgents = doAgents;\r
-//     }\r
 \r
        public boolean isDoAgentData() {\r
                return doAgentData;\r
@@ -180,21 +97,6 @@ public class JaxbImportConfigurator extends ImportConfiguratorBase implements II
                this.doMedia = doMedia;\r
        }\r
 \r
-//     public boolean isDoOccurrences() {\r
-//             return doOccurrences;\r
-//     }\r
-//\r
-//     public void setDoOccurrences(boolean doOccurrences) {\r
-//             this.doOccurrences = doOccurrences;\r
-//     }\r
-\r
-//     public boolean isDoReferences() {\r
-//             return doReferences;\r
-//     }\r
-//\r
-//     public void setDoReferences(boolean doReferences) {\r
-//             this.doReferences = doReferences;\r
-//     }\r
 \r
        public boolean isDoReferencedEntities() {\r
                return doReferencedEntities;\r
@@ -204,13 +106,6 @@ public class JaxbImportConfigurator extends ImportConfiguratorBase implements II
                this.doReferencedEntities = doReferencedEntities;\r
        }\r
 \r
-//     public boolean isDoRelationships() {\r
-//             return doRelationships;\r
-//     }\r
-//\r
-//     public void setDoRelationships(boolean doRelationships) {\r
-//             this.doRelationships = doRelationships;\r
-//     }\r
 \r
        public boolean isDoSynonyms() {\r
                return doSynonyms;\r
@@ -220,21 +115,6 @@ public class JaxbImportConfigurator extends ImportConfiguratorBase implements II
                this.doSynonyms = doSynonyms;\r
        }\r
 \r
-//     public boolean isDoTaxonNames() {\r
-//             return doTaxonNames;\r
-//     }\r
-//\r
-//     public void setDoTaxonNames(boolean doTaxonNames) {\r
-//             this.doTaxonNames = doTaxonNames;\r
-//     }\r
-\r
-//     public boolean isDoTaxa() {\r
-//             return doTaxa;\r
-//     }\r
-//\r
-//     public void setDoTaxa(boolean doTaxa) {\r
-//             this.doTaxa = doTaxa;\r
-//     }\r
 \r
        public boolean isDoTerms() {\r
                return doTerms;\r